Merge pull request #176 from nicolasstucki/quotes

Identify quotes/splices start as the start of a normal block

src/typescript/Scala.tmLanguage.ts

@@ -591,8 +591,16 @@ export const scalaTmLanguage: TmLanguage = {
       ]
     },
     'scala-quoted': {
-      match: "('\\{|'\\[)(?!')",
-      name: 'constant.other.quoted.scala'
+      patterns: [
+        { // Start of `'{ .. }` or `${ .. }`
+          match: "['$]\\{(?!')",
+          name: 'punctuation.section.block.begin.scala'
+        },
+        { // Start of `'[ .. ]`
+          match: "'\\[(?!')",
+          name: 'meta.bracket.scala'
+        }
+      ]
     },
     'xml-doublequotedString': {
       end: '"',

tests/unit/quoted.test.scala

@@ -1,11 +1,27 @@
 // SYNTAX TEST "source.scala"
 
    '{ 2 }
-// ^^ constant.other.quoted.scala
+// ^^ punctuation.section.block.begin.scala
 //    ^ constant.numeric.scala
 //      ^ punctuation.section.block.end.scala
 
    '[ String ]
-// ^^ constant.other.quoted.scala
+// ^^ meta.bracket.scala
 //    ^^^^^^ entity.name.class
+//           ^ meta.bracket.scala
+
+
+   ${ 1 }
+// ^^ punctuation.section.block.begin.scala
+//    ^ constant.numeric.scala
+//      ^ punctuation.section.block.end.scala
+
+   case '{ x } =>
+// ^^^^ keyword.control.flow.scala
+//      ^^ punctuation.section.block.begin.scala
+//           ^ punctuation.section.block.end.scala
+
+   case '[ T ] =>
+// ^^^^ keyword.control.flow.scala
+//      ^^ meta.bracket.scala
 //           ^ meta.bracket.scala