Merge symbol and quote capturing

Syntax for quotes and symbols overlap. We can tag these as symbols and
quotes at the same time.

Author: nicolasstucki

src/typescript/Scala.tmLanguage.ts

@@ -299,17 +299,14 @@ export const scalaTmLanguage: TmLanguage = {
         {
           include: '#constants'
         },
-        {
-          include: '#scala-symbol'
-        },
         {
           include: '#singleton-type'
         },
         {
           include: '#inline'
         },
         {
-          include: '#scala-quoted'
+          include: '#scala-quoted-or-symbol'
         },
         {
           include: '#char-literal'
@@ -710,16 +707,31 @@ export const scalaTmLanguage: TmLanguage = {
         }
       ]
     },
-    'scala-quoted': {
+    'scala-quoted-or-symbol': {
       patterns: [
-        { // Start of `'{ .. }` or `${ .. }`
-          match: "['$][ \\t]*\\{(?!')",
-          name: 'punctuation.section.block.begin.scala'
+        { // `'xyz`
+          match: `(')((?>${plainid}))(?!')`,
+          captures: {
+            '1': {
+              name: 'keyword.control.flow.staging.scala constant.other.symbol.scala'
+            },
+            '2': {
+              name: 'constant.other.symbol.scala'
+            }
+          }
+        },
+        { // Start of `'{ .. }`
+          match: `'(?=\\s*\\{(?!'))`,
+          name: 'keyword.control.flow.staging.scala'
         },
         { // Start of `'[ .. ]`
-          match: "'[ \\t]*\\[(?!')",
-          name: 'meta.bracket.scala'
-        }
+          match: "'(?=\\s*\\[(?!'))",
+          name: 'keyword.control.flow.staging.scala'
+        },
+        { // Start of `${ .. }`
+          match: "\\$(?=\\s*\\{)",
+          name: 'keyword.control.flow.staging.scala'
+        },
       ]
     },
     'xml-doublequotedString': {
@@ -911,10 +923,6 @@ export const scalaTmLanguage: TmLanguage = {
         }
       }
     },
-    'scala-symbol': {
-      match: `(?>'${plainid})(?!')`,
-      name: 'constant.other.symbol.scala'
-    },
     'curly-braces': {
       begin: '\\{',
       end: '\\}',

syntaxes/Scala.tmLanguage.json

@@ -378,15 +378,20 @@
 >    ('x, 'X, 'αρετη, '=, '+ )
 #^^^^ source.scala
 #    ^ source.scala meta.bracket.scala
-#     ^^ source.scala constant.other.symbol.scala
+#     ^ source.scala keyword.control.flow.staging.scala constant.other.symbol.scala
+#      ^ source.scala constant.other.symbol.scala
 #       ^^ source.scala
-#         ^^ source.scala constant.other.symbol.scala
+#         ^ source.scala keyword.control.flow.staging.scala constant.other.symbol.scala
+#          ^ source.scala constant.other.symbol.scala
 #           ^^ source.scala
-#             ^^^^^^ source.scala constant.other.symbol.scala
+#             ^ source.scala keyword.control.flow.staging.scala constant.other.symbol.scala
+#              ^^^^^ source.scala constant.other.symbol.scala
 #                   ^^ source.scala
-#                     ^^ source.scala constant.other.symbol.scala
+#                     ^ source.scala keyword.control.flow.staging.scala constant.other.symbol.scala
+#                      ^ source.scala constant.other.symbol.scala
 #                       ^^ source.scala
-#                         ^^ source.scala constant.other.symbol.scala
+#                         ^ source.scala keyword.control.flow.staging.scala constant.other.symbol.scala
+#                          ^ source.scala constant.other.symbol.scala
 #                           ^ source.scala
 #                            ^ source.scala meta.bracket.scala
 >}

tests/snap/lexical.test.scala.snap

@@ -21,6 +21,7 @@ object ExampleIdentifiers {
 //    ^^^^^^^^^^^^^ variable.stable.declaration.scala
   val __system = 3
 //    ^^^^^^^^ variable.stable.declaration.scala
+
   val _MAX_LEN_ = 3
 //    ^^^^^^^^^ variable.stable.declaration.scala
 }

tests/unit/lexical.test.scala

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