Merge pull request #176 from keynmol/string-interpolation-case

String interpolation case pattern

Author: ckipp01

corpus/expressions.txt

@@ -420,6 +420,8 @@ def matchTest(x: Int): String = x match {
   case A if a == 1 =>
   case A if a == 2 => 2
   case ((i, _)) => i
+  case s"$l1 -- $l2" => 
+    l1 + l2
   case _ =>
     val x = "many"
     "more"
@@ -440,6 +442,18 @@ def matchTest(x: Int): String = x match {
       (case_clause (identifier) (guard (infix_expression (identifier) (operator_identifier) (integer_literal))))
       (case_clause (identifier) (guard (infix_expression (identifier) (operator_identifier) (integer_literal))) (integer_literal))
       (case_clause (tuple_pattern (tuple_pattern (identifier) (wildcard))) (identifier))
+      (case_clause
+        (interpolated_string_expression
+          (identifier)
+          (interpolated_string
+            (interpolation
+              (identifier))
+            (interpolation
+              (identifier))))
+        (infix_expression
+          (identifier)
+          (operator_identifier)
+          (identifier)))
       (case_clause (wildcard) (val_definition (identifier) (string)) (string))))))
 
 ===============================

grammar.js

@@ -777,6 +777,7 @@ module.exports = grammar({
     _pattern: $ => choice(
       $._identifier,
       $.stable_identifier,
+      $.interpolated_string_expression,
       $.capture_pattern,
       $.tuple_pattern,
       $.case_class_pattern,
@@ -1317,7 +1318,7 @@ module.exports = grammar({
       )
     ),
 
-    string :$ =>
+    string: $ =>
       choice(
         $._simple_string,
         $._simple_multiline_string

script/smoke_test.sh

@@ -3,7 +3,7 @@
 # This is an integration test to generally check the quality of parsing.
 
 SCALA_SCALA_LIBRARY_EXPECTED=100
-SCALA_SCALA_COMPILER_EXPECTED=66
+SCALA_SCALA_COMPILER_EXPECTED=67
 DOTTY_COMPILER_EXPECTED=65
 
 if [ ! -d "$SCALA_SCALA_DIR" ]; then