Fixes SI-5532

xeno-by · xeno-by · commit c1e76ddb80cf · 2012-03-01T09:59:42.000+01:00
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
@@ -670,12 +670,18 @@ trait Scanners extends ScannersCommon {
         next.offset = charOffset - 1
       }
       if (ch == '"') {
-        nextRawChar()
-        if (!multiLine || isTripleQuote()) {
+        if (multiLine) {
+          nextRawChar()
+          if (isTripleQuote()) {
+            setStrVal()
+            token = STRINGLIT
+          } else
+            getStringPart(multiLine)
+        } else {
+          nextChar()
           setStrVal()
           token = STRINGLIT
-        } else
-          getStringPart(multiLine)
+        }
       } else if (ch == '$') {
         nextRawChar()
         if (ch == '$') {
diff --git a/test/files/run/t5532.flags b/test/files/run/t5532.flags
@@ -0,0 +1 @@
+-Xexperimental
diff --git a/test/files/run/t5532.scala b/test/files/run/t5532.scala
@@ -0,0 +1,4 @@
+object Test extends App {
+  val x = s"1"
+  val y = s"2"
+}
