Merge pull request #3112 from adriaanm/modularize-scaladoc

Modularize scaladoc... almost

1 files changed, 16 insertions, 1 deletions

diff --git a/test/files/presentation/memory-leaks/MemoryLeaksTest.scala b/test/files/presentation/memory-leaks/MemoryLeaksTest.scala
index 1ddeb6ac4a..f09c6f8e2c 100644
--- a/test/files/presentation/memory-leaks/MemoryLeaksTest.scala
+++ b/test/files/presentation/memory-leaks/MemoryLeaksTest.scala
@@ -3,6 +3,7 @@ import java.io.FileOutputStream
 import java.util.Calendar
 
 import scala.reflect.internal.util.BatchSourceFile
+import scala.tools.nsc.interactive
 import scala.tools.nsc.interactive.tests._
 import scala.tools.nsc.io._
 import scala.tools.nsc.doc
@@ -25,7 +26,21 @@ import scala.tools.nsc.doc
 object Test extends InteractiveTest {
   final val mega = 1024 * 1024
 
-  override val withDocComments = true
+  import interactive.Global
+  trait InteractiveScaladocAnalyzer extends interactive.InteractiveAnalyzer with doc.ScaladocAnalyzer {
+    val global : Global
+    override def newTyper(context: Context) = new Typer(context) with InteractiveTyper with ScaladocTyper {
+      override def canAdaptConstantTypeToLiteral = false
+    }
+  }
+
+  private class ScaladocEnabledGlobal extends Global(settings, compilerReporter) {
+    override lazy val analyzer = new {
+      val global: ScaladocEnabledGlobal.this.type = ScaladocEnabledGlobal.this
+    } with InteractiveScaladocAnalyzer
+  }
+
+  override def createGlobal: Global = new ScaladocEnabledGlobal
 
   override def execute(): Unit = memoryConsumptionTest()