diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-08-12 12:08:11 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-08-13 13:27:05 +1000 |
| commit | 36732d7a14ab246d9ab6b011a0eafe4115978f19 (patch) | |
| tree | 7687b88bd748372655b5791d8e9d70337035e061 /src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala | |
| parent | ad67700b1cc685f115da14a5af759b8859f1e9c2 (diff) | |
| download | scala-36732d7a14ab246d9ab6b011a0eafe4115978f19.tar.gz scala-36732d7a14ab246d9ab6b011a0eafe4115978f19.tar.bz2 scala-36732d7a14ab246d9ab6b011a0eafe4115978f19.zip | |
Javadoc: make parsing of java comments optional
Diffstat (limited to 'src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala')
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala b/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala index 625d074df5..10d8286528 100644 --- a/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala +++ b/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala @@ -13,7 +13,11 @@ 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 def newJavaUnitParser(unit: CompilationUnit) = if (createJavadoc) { + new syntaxAnalyzer.ScaladocJavaUnitParser(unit) + } else { + super.newJavaUnitParser(unit) + } override lazy val syntaxAnalyzer = new ScaladocSyntaxAnalyzer[outer.type](outer) { val runsAfter = List[String]() @@ -41,7 +45,7 @@ class ScaladocGlobal(settings: doc.Settings, reporter: Reporter) extends Global( phasesSet += analyzer.typerFactory } override def forScaladoc = true - override def createJavadoc = true + override def createJavadoc = if (settings.docNoJavaComments.value) false else true override lazy val analyzer = new { val global: ScaladocGlobal.this.type = ScaladocGlobal.this |