aboutsummaryrefslogtreecommitdiff
path: root/dottydoc/jvm/src/dotty/tools/dottydoc/model/CommentParsers.scala
diff options
context:
space:
mode:
Diffstat (limited to 'dottydoc/jvm/src/dotty/tools/dottydoc/model/CommentParsers.scala')
-rw-r--r--dottydoc/jvm/src/dotty/tools/dottydoc/model/CommentParsers.scala20
1 files changed, 9 insertions, 11 deletions
diff --git a/dottydoc/jvm/src/dotty/tools/dottydoc/model/CommentParsers.scala b/dottydoc/jvm/src/dotty/tools/dottydoc/model/CommentParsers.scala
index cc7bf6949..08d9d4a5a 100644
--- a/dottydoc/jvm/src/dotty/tools/dottydoc/model/CommentParsers.scala
+++ b/dottydoc/jvm/src/dotty/tools/dottydoc/model/CommentParsers.scala
@@ -8,21 +8,19 @@ import dotc.core.Contexts.Context
object CommentParsers {
import comment._
import BodyParsers._
+ import Entities.{Entity, Package}
sealed class WikiParser
extends CommentCleaner with CommentParser with CommentExpander {
- def parseHtml(sym: Symbol)(implicit ctx: Context): Option[Comment]= {
- println("Original ---------------------")
- println(ctx.base.docstring(sym).map(_.chrs).getOrElse(""))
- val expanded = expand(sym)
- println("Expanded ---------------------")
- println(expanded)
- parse(clean(expanded), expanded).toHtml match {
- case "" => None
- case x => Some(Comment(x))
- }
+ def parseHtml(sym: Symbol, entity: Entity, packages: Map[String, Package])(implicit ctx: Context): Option[Comment] =
+ ctx.base.docstring(sym).map { d =>
+ val expanded = expand(sym)
+ parse(entity, packages, clean(expanded), expanded, d.pos).toHtml(entity) match {
+ case "" => None
+ case x => Some(Comment(x))
+ }
+ }.flatten
}
- }
val wikiParser = new WikiParser
}