Skip to content

Commit af49d9c

Browse files
committed
SI-8948 resurrect the scaladoc for Any/AnyRef/Nothing/Null.
They disappeared in dc1cd96 when `scala.tools.nsc.doc.DocParser` lost its `override def forScaladoc = true`, which used to trigger whether to parse `DocDef` nodes. This was deprecated in favor of a custom global when scaladoc was modularized out (scala#2226), but `DocParser` didn't get it since it didn't override `forScaladoc` anymore... I added back `forScaladoc` in `DocParser` for consistency with `ScaladocGlobal`, although it doesn't do anything anymore.
1 parent d28d4f4 commit af49d9c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/scaladoc/scala/tools/nsc/doc/DocParser.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ import DocParser.Parsed
1515
* right after parsing so it can read `DocDefs` from source code which would
1616
* otherwise cause the compiler to go haywire.
1717
*/
18-
class DocParser(settings: nsc.Settings, reporter: Reporter) extends Global(settings, reporter) {
18+
class DocParser(settings: nsc.Settings, reporter: Reporter) extends Global(settings, reporter) with ScaladocGlobalTrait {
1919
def this(settings: Settings) = this(settings, new ConsoleReporter(settings))
2020
def this() = this(new Settings(Console println _))
2121

2222
// the usual global initialization
2323
locally { new Run() }
2424

25+
override def forScaladoc = true
2526
override protected def computeInternalPhases() {
2627
phasesSet += syntaxAnalyzer
2728
}

0 commit comments

Comments
 (0)