From dcd4d6700660c480b29eb4c8aeba77403c112d5f Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Sat, 31 Jan 2015 15:55:35 -0800
Subject: SI-9127 Xlint doesn't think spaces are significant

For purposes of warning about missing interpolators,
such as `"$greeting"` when the intended code was `s"$greeting"`,
spaces are no longer significant.

The heuristic was previously intended to allow compileresque
strings, where the dollar sign is a common prefix.

Currently, the Xlint warning can be selectively disabled.
---
 test/files/neg/t7848-interp-warn.check |  5 ++++-
 test/files/neg/t7848-interp-warn.scala |  2 +-
 test/files/neg/t9127.check             | 12 ++++++++++++
 test/files/neg/t9127.flags             |  1 +
 test/files/neg/t9127.scala             |  7 +++++++
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 test/files/neg/t9127.check
 create mode 100644 test/files/neg/t9127.flags
 create mode 100644 test/files/neg/t9127.scala

(limited to 'test')

diff --git a/test/files/neg/t7848-interp-warn.check b/test/files/neg/t7848-interp-warn.check
index 4cf9d55ffd..637fc8941a 100644
--- a/test/files/neg/t7848-interp-warn.check
+++ b/test/files/neg/t7848-interp-warn.check
@@ -4,9 +4,12 @@ t7848-interp-warn.scala:8: warning: possible missing interpolator: detected inte
 t7848-interp-warn.scala:12: warning: possible missing interpolator: detected an interpolated expression
     "A doubly important ${foo * 2} message!"
     ^
+t7848-interp-warn.scala:15: warning: possible missing interpolator: detected interpolated identifier `$bar`
+  def i = s"Try using '${ "$bar" }' instead."  // was: no warn on space test
+                          ^
 t7848-interp-warn.scala:16: warning: possible missing interpolator: detected interpolated identifier `$bar`
   def j = s"Try using '${ "something like $bar" }' instead."  // warn
                           ^
 error: No warnings can be incurred under -Xfatal-warnings.
-three warnings found
+four warnings found
 one error found
diff --git a/test/files/neg/t7848-interp-warn.scala b/test/files/neg/t7848-interp-warn.scala
index 3887aff8de..a76141041d 100644
--- a/test/files/neg/t7848-interp-warn.scala
+++ b/test/files/neg/t7848-interp-warn.scala
@@ -12,7 +12,7 @@ object Test {
     "A doubly important ${foo * 2} message!"
   }
   def h = s"Try using '$$bar' instead."  // no warn
-  def i = s"Try using '${ "$bar" }' instead."  // no warn on space test
+  def i = s"Try using '${ "$bar" }' instead."  // was: no warn on space test
   def j = s"Try using '${ "something like $bar" }' instead."  // warn
   def k = f"Try using '$bar' instead."  // no warn on other std interps
 }
diff --git a/test/files/neg/t9127.check b/test/files/neg/t9127.check
new file mode 100644
index 0000000000..2ecf8af464
--- /dev/null
+++ b/test/files/neg/t9127.check
@@ -0,0 +1,12 @@
+t9127.scala:4: warning: possible missing interpolator: detected interpolated identifier `$s`
+  val t = "$s"
+          ^
+t9127.scala:5: warning: possible missing interpolator: detected an interpolated expression
+  val u = "a${s}b"
+          ^
+t9127.scala:6: warning: possible missing interpolator: detected interpolated identifier `$s`
+  val v = "a$s b"
+          ^
+error: No warnings can be incurred under -Xfatal-warnings.
+three warnings found
+one error found
diff --git a/test/files/neg/t9127.flags b/test/files/neg/t9127.flags
new file mode 100644
index 0000000000..b0d7bc25cb
--- /dev/null
+++ b/test/files/neg/t9127.flags
@@ -0,0 +1 @@
+-Xlint:missing-interpolator -Xfatal-warnings
diff --git a/test/files/neg/t9127.scala b/test/files/neg/t9127.scala
new file mode 100644
index 0000000000..c0746144eb
--- /dev/null
+++ b/test/files/neg/t9127.scala
@@ -0,0 +1,7 @@
+
+trait X {
+  val s = "hello"
+  val t = "$s"
+  val u = "a${s}b"
+  val v = "a$s b"
+}
-- 
cgit v1.2.3