From 956923acd32766c63cd0eab0788d1811481d7e30 Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Wed, 20 Apr 2016 07:28:54 -0700
Subject: SI-9735 REPL prefer standard escapes for code text (#5086)

When constructing code text for compilation, the REPL
should prefer standard escape sequences, in case unicode
escapes are disabled.
---
 test/files/run/repl-no-uescape.check |  5 +++++
 test/files/run/repl-no-uescape.scala | 31 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 test/files/run/repl-no-uescape.check
 create mode 100644 test/files/run/repl-no-uescape.scala

(limited to 'test/files/run')

diff --git a/test/files/run/repl-no-uescape.check b/test/files/run/repl-no-uescape.check
new file mode 100644
index 0000000000..01eeafaa70
--- /dev/null
+++ b/test/files/run/repl-no-uescape.check
@@ -0,0 +1,5 @@
+
+scala> object A
+defined object A
+
+scala> :quit
diff --git a/test/files/run/repl-no-uescape.scala b/test/files/run/repl-no-uescape.scala
new file mode 100644
index 0000000000..1865109ebf
--- /dev/null
+++ b/test/files/run/repl-no-uescape.scala
@@ -0,0 +1,31 @@
+import scala.tools.partest.ReplTest
+import scala.tools.nsc.Settings
+
+/*
+scala> object A
+<console>:10: error: invalid escape character
++ "defined object " + "A" + "\u000A"
+
+Under -Dscala.color=true control chars are common
+  $eval.this.$print = {
+    $line2.$read.$iw.$iw;
+    "\033[1m\033[34mres1\033[0m: \033[1m\033[32mInt\033[0m = ".+(scala.runtime.ScalaRunTime.replStringOf($line2.$read.$iw.$iw.res1, 1000))
+  };
+
+$ skala -Dscala.color=true -Xno-uescape
+Welcome to Scala 2.11.9-20160323-163638-1fcfdd8c8b (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_60).
+Type in expressions for evaluation. Or try :help.
+
+scala> 42
+<console>:10: error: invalid escape character
+ + "\u001B[1m\u001B[34mres0\u001B[0m: \u001B[1m\u001B[32mInt\u001B[0m = " + scala.runtime.ScalaRunTime.replStringOf(res0, 1000)
+ */
+object Test extends ReplTest {
+  override def transformSettings(settings: Settings): Settings = {
+    settings.nouescape.value = true
+    settings
+  }
+  def code = """
+object A
+  """
+}
-- 
cgit v1.2.3


From 684c314d882dcfd26558c9972cfd5acabc9f051f Mon Sep 17 00:00:00 2001
From: som-snytt <som.snytt@gmail.com>
Date: Wed, 20 Apr 2016 07:48:57 -0700
Subject: SI-9734 Narrow type when import REPL history (#5084)

Under `-Yrepl-class-based`, imports from historical `$read`
instances must be singleton-typed so that path-dependent types
remain so.
---
 src/repl/scala/tools/nsc/interpreter/Imports.scala |  2 +-
 test/files/run/repl-paste-6.check                  | 17 ++++++++++++++++
 test/files/run/repl-paste-6.scala                  | 23 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100755 test/files/run/repl-paste-6.check
 create mode 100644 test/files/run/repl-paste-6.scala

(limited to 'test/files/run')

diff --git a/src/repl/scala/tools/nsc/interpreter/Imports.scala b/src/repl/scala/tools/nsc/interpreter/Imports.scala
index 5742c1d0d8..f04e2e808c 100644
--- a/src/repl/scala/tools/nsc/interpreter/Imports.scala
+++ b/src/repl/scala/tools/nsc/interpreter/Imports.scala
@@ -183,7 +183,7 @@ trait Imports {
                   case _ =>
                     val valName = req.lineRep.packageName + req.lineRep.readName
                     if (!tempValLines.contains(req.lineRep.lineId)) {
-                      code.append(s"val $valName = $objName\n")
+                      code.append(s"val $valName: ${objName}.type = $objName\n")
                       tempValLines += req.lineRep.lineId
                     }
                     code.append(s"import $valName${req.accessPath}.`$imv`;\n")
diff --git a/test/files/run/repl-paste-6.check b/test/files/run/repl-paste-6.check
new file mode 100755
index 0000000000..efcea9274f
--- /dev/null
+++ b/test/files/run/repl-paste-6.check
@@ -0,0 +1,17 @@
+
+scala> :paste < EOF
+// Entering paste mode (EOF to finish)
+
+case class C(i: Int)
+val c = C(42)
+EOF
+
+// Exiting paste mode, now interpreting.
+
+defined class C
+c: C = C(42)
+
+scala> val d: C = c // shew
+d: C = C(42)
+
+scala> :quit
diff --git a/test/files/run/repl-paste-6.scala b/test/files/run/repl-paste-6.scala
new file mode 100644
index 0000000000..8040d24f8a
--- /dev/null
+++ b/test/files/run/repl-paste-6.scala
@@ -0,0 +1,23 @@
+
+import scala.tools.partest.ReplTest
+import scala.tools.nsc.Settings
+
+
+/*
+ * Add // show to witness:
+ *     val $line3$read: $line3.$read.INSTANCE.type = $line3.$read.INSTANCE;
+ */
+object Test extends ReplTest {
+  override def transformSettings(settings: Settings): Settings = {
+    settings.Yreplclassbased.value = true
+    settings
+  }
+  def code = 
+    """
+:paste < EOF
+case class C(i: Int)
+val c = C(42)
+EOF
+val d: C = c // shew
+    """
+}
-- 
cgit v1.2.3