Closes #1010: recognize string interpolation in Scala lexer.

2 files changed, 18 insertions, 0 deletions

diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py
index 19f0ded9..34198530 100644
--- a/pygments/lexers/jvm.py
+++ b/pygments/lexers/jvm.py
@@ -268,6 +268,8 @@ class ScalaLexer(RegexLexer):
             (r'""".*?"""(?!")', String),
             (r'"(\\\\|\\"|[^"])*"', String),
             (r"'\\.'|'[^\\]'|'\\u[0-9a-fA-F]{4}'", String.Char),
+            (r'[fs]"', String, 'interpstring'),  # interpolated strings
+            (r'raw"(\\\\|\\"|[^"])*"', String),  # raw strings
             # (ur'(\.)(%s|%s|`[^`]+`)' % (idrest, op), bygroups(Operator,
             # Name.Attribute)),
             (idrest, Name),
@@ -320,6 +322,17 @@ class ScalaLexer(RegexLexer):
         'import': [
             (u'(%s|\\.)+' % idrest, Name.Namespace, '#pop')
         ],
+        'interpstring': [
+            (r'[^"$\\]', String),
+            (r'\$\{', String.Interpol, 'interpbrace'),
+            (r'\\.', String),
+            (r'"', String, '#pop'),
+        ],
+        'interpbrace': [
+            (r'\}', String.Interpol, '#pop'),
+            (r'\{', String.Interpol, '#push'),
+            include('root'),
+        ]
     }
 
 
diff --git a/tests/examplefiles/Errors.scala b/tests/examplefiles/Errors.scala
index 67198c05..7af70280 100644
--- a/tests/examplefiles/Errors.scala
+++ b/tests/examplefiles/Errors.scala
@@ -11,6 +11,11 @@ String
   val foo_+ = "foo plus"
   val foo_⌬⌬ = "double benzene"
 
+  // Test some interpolated strings
+  val mu = s"${if (true) "a:b" else "c" {with "braces"}}"
+  val mu2 = f"${if (true) "a:b" else "c" {with "braces"}}"
+  val raw = raw"a raw\nstring\"with escaped quotes"
+
   def main(argv: Array[String]) {
     println(⌘.interface + " " + foo_+ + " " + foo_⌬⌬ )
   }