Revert "Enable magic imports unconditionally to survey test results"

This reverts commit bd67b4d.
retronym · Dec 5, 2019 · 16778e7 · 16778e7
1 parent bbe359d
commit 16778e7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -237,6 +237,7 @@ trait ScalaSettings extends AbsScalaSettings
   val YmacroFresh     = BooleanSetting    ("-Ymacro-global-fresh-names", "Should fresh names in macros be unique across all compilation units")
   val Yreplsync       = BooleanSetting    ("-Yrepl-sync", "Do not use asynchronous code for repl startup")
   val Yreplclassbased = BooleanSetting    ("-Yrepl-class-based", "Use classes to wrap REPL snippets instead of objects")
+  val YreplMagicImport = BooleanSetting    ("-Yrepl-use-magic-imports", "In the code the wraps REPL snippes, use magic imports to rather than nesting wrapper object/classes")
   val Yreploutdir     = StringSetting     ("-Yrepl-outdir", "path", "Write repl-generated classfiles to given output directory (use \"\" to generate a temporary dir)" , "")
   val YmethodInfer    = BooleanSetting    ("-Yinfer-argument-types", "Infer types for arguments of overridden methods.")
   val YdisableFlatCpCaching  = BooleanSetting    ("-YdisableFlatCpCaching", "Do not cache flat classpath representation of classpath elements from jars across compiler instances.")

diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala
@@ -75,7 +75,7 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
   def showDirectory() = replOutput.show(out)
 
   lazy val isClassBased: Boolean = settings.Yreplclassbased.value
-  private[interpreter] lazy val useMagicImport: Boolean = true
+  private[interpreter] lazy val useMagicImport: Boolean = settings.YreplMagicImport.value
 
   private[nsc] var printResults               = true        // whether to print result lines
   private[nsc] var totalSilence               = false       // whether to print anything

diff --git a/test/files/run/repl-colon-type.check b/test/files/run/repl-colon-type.check
@@ -39,7 +39,7 @@ scala> :type protected lazy val f = 5
  enclosing object $eval in package $line13 is not a subclass of
  object $iw where target is defined
          lazy val $result = f
-                                              ^
+                                                  ^
 
 scala> :type def f = 5
 => Int

diff --git a/test/files/run/repl-out-dir.check b/test/files/run/repl-out-dir.check
@@ -13,26 +13,30 @@ repl-out-dir-run.obj
     $line2
         $eval$.class
         $eval.class
+        $read$$iw$$iw$.class
         $read$$iw$.class
         $read$.class
         $read.class
     $line3
         $eval$.class
         $eval.class
+        $read$$iw$$iw$.class
+        $read$$iw$$iw$Bippy$.class
+        $read$$iw$$iw$Bippy.class
         $read$$iw$.class
-        $read$$iw$Bippy$.class
-        $read$$iw$Bippy.class
         $read$.class
         $read.class
     $line4
         $eval$.class
         $eval.class
+        $read$$iw$$iw$.class
         $read$$iw$.class
         $read$.class
         $read.class
     $line5
         $eval$.class
         $eval.class
+        $read$$iw$$iw$.class
         $read$$iw$.class
         $read$.class
         $read.class

diff --git a/test/files/run/t5256d.check b/test/files/run/t5256d.check
@@ -15,7 +15,7 @@ scala> println(c)
 class A
 
 scala> println(c.fullName)
-$line8.$read.$iw.A
+$line8.$read.$iw.$iw.$iw.$iw.A
 
 scala> println(c.info)
 AnyRef {

diff --git a/test/files/run/t7747-repl.check b/test/files/run/t7747-repl.check
@@ -251,18 +251,25 @@ sealed class $read extends _root_.java.io.Serializable {
     super.<init>;
     ()
   };
-  import $line44.$read.INSTANCE.$iw.BippyBups;
-  import $line44.$read.INSTANCE.$iw.BippyBups;
-  import $line45.$read.INSTANCE.$iw.PuppyPups;
-  import $line45.$read.INSTANCE.$iw.PuppyPups;
-  import $line46.$read.INSTANCE.$iw.Bingo;
-  import $line46.$read.INSTANCE.$iw.Bingo;
   sealed class $iw extends _root_.java.io.Serializable {
     def <init>() = {
       super.<init>;
       ()
     };
-    val res3 = List(BippyBups, PuppyPups, Bingo)
+    import $line44.$read.INSTANCE.$iw.$iw.BippyBups;
+    import $line44.$read.INSTANCE.$iw.$iw.BippyBups;
+    import $line45.$read.INSTANCE.$iw.$iw.PuppyPups;
+    import $line45.$read.INSTANCE.$iw.$iw.PuppyPups;
+    import $line46.$read.INSTANCE.$iw.$iw.Bingo;
+    import $line46.$read.INSTANCE.$iw.$iw.Bingo;
+    sealed class $iw extends _root_.java.io.Serializable {
+      def <init>() = {
+        super.<init>;
+        ()
+      };
+      val res3 = List(BippyBups, PuppyPups, Bingo)
+    };
+    val $iw = new $iw.<init>
   };
   val $iw = new $iw.<init>
 }