diff options
Diffstat (limited to 'src/scaladoc')
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala b/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala index 91d5fef4cf..94d3809fc3 100644 --- a/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala +++ b/src/scaladoc/scala/tools/nsc/doc/ScaladocGlobal.scala @@ -23,9 +23,14 @@ trait ScaladocGlobalTrait extends Global { val runsAfter = List[String]() val runsRightAfter = None } - override lazy val loaders = new SymbolLoaders { - val global: outer.type = outer + override lazy val loaders = new { + val symbolTable: outer.type = outer + val platform: outer.platform.type = outer.platform + // `global` val is needed so we conform to loaders type in Global in Scala 2.11.0-M4 + // TODO: remove once 2.11.0-M5 is used to build Scaladoc + val global: outer.type = outer + } with SymbolLoaders { // SI-5593 Scaladoc's current strategy is to visit all packages in search of user code that can be documented // therefore, it will rummage through the classpath triggering errors whenever it encounters package objects // that are not in their correct place (see bug for details) @@ -33,7 +38,12 @@ trait ScaladocGlobalTrait extends Global { log(s"Suppressing error involving $root: $ex") } - def lookupMemberAtTyperPhaseIfPossible(sym: Symbol, name: Name): Symbol = { + // TODO: Add `override` modifier once Scala 2.11.0-M5 is used to build Scaladoc + protected /*override*/ def compileLate(srcfile: io.AbstractFile): Unit = + currentRun.compileLate(srcfile) + + // TODO: Add `override` modifier once Scala 2.11.0-M5 is used to build Scaladoc + protected def /*override*/ lookupMemberAtTyperPhaseIfPossible(sym: Symbol, name: Name): Symbol = { def lookup = sym.info.member(name) // if loading during initialization of `definitions` typerPhase is not yet set. // in that case we simply load the member at the current phase |