Merge pull request scala-ide#144 from andyscott/interpolated-wildcard…

…-extractors Add lexer support for string extractors with wildcards
jkinkead · Feb 18, 2016 · 3815922 · 3815922
2 parents 0053fd5 + a51c9af
commit 3815922
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/scalariform/src/main/scala/scalariform/lexer/ScalaOnlyLexer.scala b/scalariform/src/main/scala/scalariform/lexer/ScalaOnlyLexer.scala
@@ -238,6 +238,9 @@ private[lexer] trait ScalaOnlyLexer { self: ScalaLexer ⇒
       if (ch == '$') {
         nextChar()
         getStringPart(multiLine)
+      } else if (ch == '_') {
+        token(STRING_PART)
+        stringInterpolationMode.interpolationVariable = true
       } else if (ch == '{') {
         token(STRING_PART)
         switchToScalaMode()

diff --git a/scalariform/src/test/scala/scalariform/lexer/ScalaLexerTest.scala b/scalariform/src/test/scala/scalariform/lexer/ScalaLexerTest.scala
@@ -129,6 +129,8 @@ class ScalaLexerTest extends FlatSpec with ShouldMatchers {
 
     """ s"$this" """ producesTokens (WS, INTERPOLATION_ID, STRING_PART, THIS, STRING_LITERAL, WS)
 
+    """ s"$_" """ producesTokens (WS, INTERPOLATION_ID, STRING_PART, USCORE, STRING_LITERAL, WS)
+
     <t>s""""""</t>.text producesTokens (INTERPOLATION_ID, STRING_LITERAL)
     <t>s"""""""""</t>.text producesTokens (INTERPOLATION_ID, STRING_LITERAL)
     <t>s""" $foo """</t>.text producesTokens (INTERPOLATION_ID, STRING_PART, VARID, STRING_LITERAL)