summaryrefslogtreecommitdiff
path: root/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-04-25 15:00:09 -0700
committerJakob Odersky <jakob@odersky.com>2016-07-15 01:20:32 -0700
commit543d719dce062e6ea99c21c7320def711af1cf9e (patch)
treedb6230e5667241dc007788563510c3b390368d6c /src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala
parent4e564efb04e508ccc0f479cf1a25331501927d88 (diff)
downloadscala-543d719dce062e6ea99c21c7320def711af1cf9e.tar.gz
scala-543d719dce062e6ea99c21c7320def711af1cf9e.tar.bz2
scala-543d719dce062e6ea99c21c7320def711af1cf9e.zip
Retain javadoc comments in scaladoc
* Hook into java parser to generate doc comments * Generate empty trees for java implementation bodies
Diffstat (limited to 'src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala')
-rw-r--r--src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala b/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala
index 10bfe6f94b..625d074df5 100644
--- a/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala
@@ -13,6 +13,7 @@ trait ScaladocGlobalTrait extends Global {
override val useOffsetPositions = false
override def newUnitParser(unit: CompilationUnit) = new syntaxAnalyzer.ScaladocUnitParser(unit, Nil)
+ override def newJavaUnitParser(unit: CompilationUnit) = new syntaxAnalyzer.ScaladocJavaUnitParser(unit)
override lazy val syntaxAnalyzer = new ScaladocSyntaxAnalyzer[outer.type](outer) {
val runsAfter = List[String]()
@@ -40,6 +41,8 @@ class ScaladocGlobal(settings: doc.Settings, reporter: Reporter) extends Global(
phasesSet += analyzer.typerFactory
}
override def forScaladoc = true
+ override def createJavadoc = true
+
override lazy val analyzer = new {
val global: ScaladocGlobal.this.type = ScaladocGlobal.this
} with ScaladocAnalyzer