Default false -Yrepl-{class-based,use-magic-imports}

The intent is for these to be true, but we'll do that for 2.13.x,
not 2.12.x.

Author: dwijnand

src/compiler/scala/tools/nsc/settings/ScalaSettings.scala

@@ -236,8 +236,8 @@ trait ScalaSettings extends AbsScalaSettings
   val Ymacronoexpand  = BooleanSetting    ("-Ymacro-no-expand", "Don't expand macros. Might be useful for scaladoc and presentation compiler, but will crash anything which uses macros and gets past typer.") withDeprecationMessage(s"Use ${Ymacroexpand.name}:${MacroExpand.None}") withPostSetHook(_ => Ymacroexpand.value = MacroExpand.None)
   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") withDefault true
-  val YreplMagicImport = BooleanSetting   ("-Yrepl-use-magic-imports", "In the code that wraps REPL snippets, use magic imports rather than nesting wrapper object/classes") withDefault true
+  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 that wraps REPL snippets, use magic imports 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.")

test/files/run/repl-colon-type.check

@@ -34,12 +34,12 @@ scala> :type lazy val f = 5
 Int
 
 scala> :type protected lazy val f = 5
-<console>:5: error: lazy value f cannot be accessed in INSTANCE.$iw
+<console>:5: error: lazy value f cannot be accessed in object $iw
  Access to protected lazy value f not permitted because
  enclosing object $eval in package $line13 is not a subclass of
- class $iw where target is defined
+ object $iw where target is defined
          lazy val $result = f
-                                                       ^
+                                                           ^
 
 scala> :type def f = 5
 => Int

test/files/run/repl-out-dir.check

@@ -13,27 +13,31 @@ repl-out-dir-run.obj
     $line2
         $eval$.class
         $eval.class
-        $read$$iw.class
+        $read$$iw$$iw$.class
+        $read$$iw$.class
         $read$.class
         $read.class
     $line3
         $eval$.class
         $eval.class
-        $read$$iw$Bippy$.class
-        $read$$iw$Bippy.class
-        $read$$iw.class
+        $read$$iw$$iw$.class
+        $read$$iw$$iw$Bippy$.class
+        $read$$iw$$iw$Bippy.class
+        $read$$iw$.class
         $read$.class
         $read.class
     $line4
         $eval$.class
         $eval.class
-        $read$$iw.class
+        $read$$iw$$iw$.class
+        $read$$iw$.class
         $read$.class
         $read.class
     $line5
         $eval$.class
         $eval.class
-        $read$$iw.class
+        $read$$iw$$iw$.class
+        $read$$iw$.class
         $read$.class
         $read.class
     $repl_$init.class

test/files/run/repl-trim-stack-trace.check

@@ -6,23 +6,23 @@ f: Nothing
 
 scala> f
 java.lang.Exception: Uh-oh
-  at f(<console>:11)
+  at .f(<console>:XX)
   ... ??? elided
 
 scala> def f = throw new Exception("")
 f: Nothing
 
 scala> f
 java.lang.Exception:
-  at f(<console>:11)
+  at .f(<console>:XX)
   ... ??? elided
 
 scala> def f = throw new Exception
 f: Nothing
 
 scala> f
 java.lang.Exception
-  at f(<console>:11)
+  at .f(<console>:XX)
   ... ??? elided
 
 scala> :quit

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 {

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>
 }

test/files/run/t8843-repl-xlat.check

@@ -6,10 +6,10 @@ scala> class Bippy
 defined class Bippy
 
 scala> $intp.classLoader getResource "Bippy.class"
-res0: java.net.URL = memory:(memory)/$line4/$read$$iw$Bippy.class
+res0: java.net.URL = memory:(memory)/$line4/$read$$iw$$iw$Bippy.class
 
 scala> ($intp.classLoader getResources "Bippy.class").nextElement
-res1: java.net.URL = memory:(memory)/$line4/$read$$iw$Bippy.class
+res1: java.net.URL = memory:(memory)/$line4/$read$$iw$$iw$Bippy.class
 
 scala> ($intp.classLoader classBytes "Bippy").nonEmpty
 res2: Boolean = true