aboutsummaryrefslogtreecommitdiff
path: root/doc-tool/src/dotty/tools/dottydoc/core
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2017-01-04 17:52:48 +0100
committerFelix Mulder <felix.mulder@gmail.com>2017-01-31 14:29:17 +0100
commit08dce0704570ae8346fc28019ef5264f1e12ce25 (patch)
treef4681aa5e6736f7eb8e2a8f6575771d9b8472b9d /doc-tool/src/dotty/tools/dottydoc/core
parent877e934697cf9468add92cfca40eb9943e2ea164 (diff)
downloaddotty-08dce0704570ae8346fc28019ef5264f1e12ce25.tar.gz
dotty-08dce0704570ae8346fc28019ef5264f1e12ce25.tar.bz2
dotty-08dce0704570ae8346fc28019ef5264f1e12ce25.zip
Add ability to completely parse docstring with md or wiki
Diffstat (limited to 'doc-tool/src/dotty/tools/dottydoc/core')
-rw-r--r--doc-tool/src/dotty/tools/dottydoc/core/DocstringPhase.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc-tool/src/dotty/tools/dottydoc/core/DocstringPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/DocstringPhase.scala
index be6e3b0e8..d5b59426d 100644
--- a/doc-tool/src/dotty/tools/dottydoc/core/DocstringPhase.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/core/DocstringPhase.scala
@@ -13,8 +13,9 @@ import util.syntax._
class DocstringPhase extends DocMiniPhase with CommentParser with CommentCleaner {
private def parsedComment[E <: Entity](ent: E)(implicit ctx: Context): Option[Comment] =
ctx.docbase.docstring(ent.symbol).map { cmt =>
- parse(ent, ctx.docbase.packages, clean(cmt.raw), cmt.raw, cmt.pos)
- .toComment(_.fromBody(ent), _.fromMarkdown(ent))
+ val parsed = parse(ent, ctx.docbase.packages, clean(cmt.raw), cmt.raw, cmt.pos)
+ if (ctx.settings.wikiSyntax.value) WikiComment(parsed, ent, cmt.pos)
+ else MarkdownComment(parsed, ent)
}
override def transformPackage(implicit ctx: Context) = { case ent: PackageImpl =>