diff options
Diffstat (limited to 'src/interactive')
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index 28b84d67ba..cfe6d57eb8 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -369,9 +369,18 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") * top-level idents. Therefore, we can detect top-level symbols that have a name * different from their source file */ - override lazy val loaders: SymbolLoaders { val global: Global.this.type } = new BrowsingLoaders { - val global: Global.this.type = Global.this + protected type SymbolLoadersInInteractive = SymbolLoaders { + // `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 interactive + val global: Global.this.type + val symbolTable: Global.this.type + val platform: Global.this.platform.type } + override lazy val loaders: SymbolLoadersInInteractive = new { + val global: Global.this.type = Global.this + val symbolTable: Global.this.type = Global.this + val platform: Global.this.platform.type = Global.this.platform + } with BrowsingLoaders // ----------------- Polling --------------------------------------- |