Merge pull request #3424 from som-snytt/issue/7322

SI-7322 Interpolator idents must be encoded

2 files changed, 12 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 23a2e0b37f..e3d2bf14a0 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -1225,7 +1225,7 @@ self =>
       // Like Swiss cheese, with holes
       def stringCheese: Tree = atPos(in.offset) {
         val start = in.offset
-        val interpolator = in.name
+        val interpolator = in.name.encoded // ident() for INTERPOLATIONID
 
         val partsBuf = new ListBuffer[Tree]
         val exprBuf = new ListBuffer[Tree]
diff --git a/test/files/pos/t7322.scala b/test/files/pos/t7322.scala
new file mode 100644
index 0000000000..006bf89e9f
--- /dev/null
+++ b/test/files/pos/t7322.scala
@@ -0,0 +1,11 @@
+
+package object t7322 {
+  implicit class X(sc: StringContext) {
+    def x_?(args: Any*) = "hi there"
+  }
+}
+package t7322 {
+  trait Y {
+    x_?"junk"  // assume that if it compiles, it works
+  }
+}