Merge pull request #2461 from scalamacros/ticket/7325

Some fixes for string interpolation

11 files changed, 141 insertions, 7 deletions

diff --git a/test/files/neg/stringinterpolation_macro-neg.check b/test/files/neg/stringinterpolation_macro-neg.check
index 8986b899a3..457f497f2f 100644
--- a/test/files/neg/stringinterpolation_macro-neg.check
+++ b/test/files/neg/stringinterpolation_macro-neg.check
@@ -66,5 +66,5 @@ Note that implicit conversions are not applicable because they are ambiguous:
        ^
 stringinterpolation_macro-neg.scala:30: error: illegal conversion character
   f"$s%i"
-     ^
+       ^
 15 errors found
diff --git a/test/files/neg/t5510.check b/test/files/neg/t5510.check
index 04220e79bb..322a2f5e25 100644
--- a/test/files/neg/t5510.check
+++ b/test/files/neg/t5510.check
@@ -1,15 +1,15 @@
 t5510.scala:2: error: unclosed string literal
   val s1 = s"xxx
-            ^
+             ^
 t5510.scala:3: error: unclosed string literal
   val s2 = s"xxx $x
                    ^
 t5510.scala:4: error: unclosed string literal
   val s3 = s"xxx $$
-            ^
+             ^
 t5510.scala:5: error: unclosed string literal
   val s4 = ""s"
-              ^
+               ^
 t5510.scala:6: error: unclosed multi-line string literal
   val s5 = ""s""" $s1 $s2 s"
                          ^
diff --git a/test/files/neg/t5856.check b/test/files/neg/t5856.check
index ac49d4b9ac..08a61bdc07 100644
--- a/test/files/neg/t5856.check
+++ b/test/files/neg/t5856.check
@@ -1,6 +1,6 @@
 t5856.scala:10: error: invalid string interpolation: `$$', `$'ident or `$'BlockExpr expected
   val s9 = s"$"
-            ^
+             ^
 t5856.scala:10: error: unclosed string literal
   val s9 = s"$"
               ^
diff --git a/test/files/neg/t7325.check b/test/files/neg/t7325.check
new file mode 100644
index 0000000000..709ab6db3e
--- /dev/null
+++ b/test/files/neg/t7325.check
@@ -0,0 +1,19 @@
+t7325.scala:2: error: percent signs not directly following splicees must be escaped
+  println(f"%")
+            ^
+t7325.scala:4: error: percent signs not directly following splicees must be escaped
+  println(f"%%%")
+              ^
+t7325.scala:6: error: percent signs not directly following splicees must be escaped
+  println(f"%%%%%")
+                ^
+t7325.scala:16: error: wrong conversion string
+  println(f"${0}%")
+                ^
+t7325.scala:19: error: percent signs not directly following splicees must be escaped
+  println(f"${0}%%%d")
+                  ^
+t7325.scala:21: error: percent signs not directly following splicees must be escaped
+  println(f"${0}%%%%%d")
+                    ^
+6 errors found
diff --git a/test/files/neg/t7325.scala b/test/files/neg/t7325.scala
new file mode 100644
index 0000000000..adfd8dd47a
--- /dev/null
+++ b/test/files/neg/t7325.scala
@@ -0,0 +1,25 @@
+object Test extends App {
+  println(f"%")
+  println(f"%%")
+  println(f"%%%")
+  println(f"%%%%")
+  println(f"%%%%%")
+  println(f"%%%%%%")
+
+  println(f"%%n")
+  println(f"%%%n")
+  println(f"%%%%n")
+  println(f"%%%%%n")
+  println(f"%%%%%%n")
+  println(f"%%%%%%%n")
+
+  println(f"${0}%")
+  println(f"${0}%d")
+  println(f"${0}%%d")
+  println(f"${0}%%%d")
+  println(f"${0}%%%%d")
+  println(f"${0}%%%%%d")
+
+  println(f"${0}%n")
+  println(f"${0}%d%n")
+}
\ No newline at end of file
diff --git a/test/files/run/interpolation.scala b/test/files/run/interpolation.scala
index f443bd5feb..14d9819348 100644
--- a/test/files/run/interpolation.scala
+++ b/test/files/run/interpolation.scala
@@ -13,7 +13,7 @@ object Test extends App {
     println(s"Best price: $f")
     println(f"Best price: $f%.2f")
     println(s"$f% discount included")
-    println(f"$f%3.2f% discount included")
+    println(f"$f%3.2f%% discount included")
   }
 
   test1(1)
diff --git a/test/files/run/interpolationMultiline1.scala b/test/files/run/interpolationMultiline1.scala
index 437aed44b0..db634e7775 100644
--- a/test/files/run/interpolationMultiline1.scala
+++ b/test/files/run/interpolationMultiline1.scala
@@ -13,7 +13,7 @@ object Test extends App {
     println(s"""Best price: $f""")
     println(f"""Best price: $f%.2f""")
     println(s"""$f% discount included""")
-    println(f"""$f%3.2f% discount included""")
+    println(f"""$f%3.2f%% discount included""")
   }
 
   test1(1)
diff --git a/test/files/run/t7271.check b/test/files/run/t7271.check
new file mode 100644
index 0000000000..01632eca2c
--- /dev/null
+++ b/test/files/run/t7271.check
@@ -0,0 +1,12 @@
+[[syntax trees at end of                    parser]] // newSource1
+[0:91]package [0:0]<empty> {
+  [0:91]class C extends [8:91][91]scala.AnyRef {
+    [8]def <init>() = [8]{
+      [8][8][8]super.<init>();
+      [8]()
+    };
+    [16:44]def quote = [28:44]<28:44><28:44>[28]StringContext([30:34]"foo", [40:44]"baz").s([35:39]this);
+    [51:85]def tripleQuote = [69:85]<69:85><69:85>[69]StringContext([71:75]"foo", [81:85]"baz").s([76:80]this)
+  }
+}
+
diff --git a/test/files/run/t7271.scala b/test/files/run/t7271.scala
new file mode 100644
index 0000000000..6fccf14d20
--- /dev/null
+++ b/test/files/run/t7271.scala
@@ -0,0 +1,34 @@
+import scala.tools.partest._
+import java.io._
+import scala.tools.nsc._
+import scala.tools.nsc.util.CommandLineParser
+import scala.tools.nsc.{Global, Settings, CompilerCommand}
+import scala.tools.nsc.reporters.ConsoleReporter
+
+object Test extends DirectTest {
+
+  override def extraSettings: String = "-usejavacp -Xprint:parser -Ystop-after:parser -d " + testOutput.path
+
+  override def code = """
+    class C {
+      def quote = s"foo${this}baz"
+      def tripleQuote = s"foo${this}baz"
+    }
+  """.trim
+
+  override def show(): Unit = {
+    // redirect err to out, for logging
+    val prevErr = System.err
+    System.setErr(System.out)
+    compile()
+    System.setErr(prevErr)
+  }
+
+  override def newCompiler(args: String*): Global = {
+
+    val settings = new Settings()
+    settings.Xprintpos.value = true
+    val command = new CompilerCommand((CommandLineParser tokenize extraSettings) ++ args.toList, settings)
+    new Global(command.settings, new ConsoleReporter(settings)) with interactive.RangePositions
+  }
+}
diff --git a/test/files/run/t7325.check b/test/files/run/t7325.check
new file mode 100644
index 0000000000..3c7652f42c
--- /dev/null
+++ b/test/files/run/t7325.check
@@ -0,0 +1,19 @@
+%
+%%
+%%%
+%n
+%
+
+%%n
+%%
+
+%%%n
+%%%
+
+0
+0%d
+0%%d
+0
+
+0
+
diff --git a/test/files/run/t7325.scala b/test/files/run/t7325.scala
new file mode 100644
index 0000000000..26f6bc6ef7
--- /dev/null
+++ b/test/files/run/t7325.scala
@@ -0,0 +1,25 @@
+object Test extends App {
+  // println(f"%")
+  println(f"%%")
+  // println(f"%%%")
+  println(f"%%%%")
+  // println(f"%%%%%")
+  println(f"%%%%%%")
+
+  println(f"%%n")
+  println(f"%%%n")
+  println(f"%%%%n")
+  println(f"%%%%%n")
+  println(f"%%%%%%n")
+  println(f"%%%%%%%n")
+
+  // println(f"${0}%")
+  println(f"${0}%d")
+  println(f"${0}%%d")
+  // println(f"${0}%%%d")
+  println(f"${0}%%%%d")
+  // println(f"${0}%%%%%d")
+
+  println(f"${0}%n")
+  println(f"${0}%d%n")
+}
\ No newline at end of file