Merge pull request #5440 from som-snytt/issue/9944

SI-9944 Scan after interp expr keeps CR

2 files changed, 19 insertions, 0 deletions

diff --git a/test/files/run/t9944.check b/test/files/run/t9944.check
new file mode 100755
index 0000000000..c2b0adf311
--- /dev/null
+++ b/test/files/run/t9944.check
@@ -0,0 +1,12 @@
+[[syntax trees at end of                    parser]] // newSource1.scala
+package <empty> {
+  class C extends scala.AnyRef {
+    def <init>() = {
+      super.<init>();
+      ()
+    };
+    def g = 42;
+    def f = StringContext("123\r\n", "\r\n123\r\n").s(g)
+  }
+}
+
diff --git a/test/files/run/t9944.scala b/test/files/run/t9944.scala
new file mode 100644
index 0000000000..01cd481266
--- /dev/null
+++ b/test/files/run/t9944.scala
@@ -0,0 +1,7 @@
+
+import scala.tools.partest.ParserTest
+
+object Test extends ParserTest {
+
+  def code = s"""class C { def g = 42 ; def f = s""\"123\r\n$${ g }\r\n123\r\n""\"}"""
+}