tm-grammars 1.22.19 → 1.23.0

package/grammars/graphql.json

@@ -86,7 +86,7 @@
           "include": "#graphql-description-singleline"
         },
         {
-          "begin": "\\s*([_A-Za-z][_0-9A-Za-z]*)(?:\\s*(:))",
+          "begin": "\\s*([_A-Za-z][_0-9A-Za-z]*)\\s*(:)",
           "beginCaptures": {
             "1": {
               "name": "variable.parameter.graphql"
@@ -95,7 +95,7 @@
               "name": "punctuation.colon.graphql"
             }
           },
-          "end": "(?=\\s*(?:(?:([_A-Za-z][_0-9A-Za-z]*)\\s*(:))|\\)))|\\s*(,)",
+          "end": "(?=\\s*(?:([_A-Za-z][_0-9A-Za-z]*)\\s*(:)|\\)))|\\s*(,)",
           "endCaptures": {
             "3": {
               "name": "punctuation.comma.graphql"
@@ -302,7 +302,7 @@
       "name": "meta.enum.graphql",
       "patterns": [
         {
-          "begin": "\\s*({)",
+          "begin": "\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.operation.graphql"
@@ -401,10 +401,10 @@
           "name": "constant.numeric.float.graphql"
         }
       },
-      "match": "\\s*(-?(0|[1-9][0-9]*)(\\.[0-9]+)?((e|E)(\\+|-)?[0-9]+)?)"
+      "match": "\\s*(-?(0|[1-9][0-9]*)(\\.[0-9]+)?(([eE])([+\\-])?[0-9]+)?)"
     },
     "graphql-fragment-definition": {
-      "begin": "\\s*(?:(\\bfragment\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)?\\s*(?:(\\bon\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)))",
+      "begin": "\\s*(\\bfragment\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)?\\s*(\\bon\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)",
       "captures": {
         "1": {
           "name": "keyword.fragment.graphql"
@@ -549,7 +549,7 @@
               "name": "keyword.operator.nulltype.graphql"
             }
           },
-          "end": "\\s*(\\])(?:\\s*(!))?",
+          "end": "\\s*(])(?:\\s*(!))?",
           "name": "meta.type.list.graphql",
           "patterns": [
             {
@@ -583,7 +583,7 @@
               "name": "meta.brace.square.graphql"
             }
           },
-          "end": "\\s*(\\])",
+          "end": "\\s*(])",
           "endCaptures": {
             "1": {
               "name": "meta.brace.square.graphql"
@@ -631,7 +631,7 @@
     "graphql-object-value": {
       "patterns": [
         {
-          "begin": "\\s*+({)",
+          "begin": "\\s*+(\\{)",
           "beginCaptures": {
             "1": {
               "name": "meta.brace.curly.graphql"
@@ -714,7 +714,7 @@
       "end": "(?<=})",
       "patterns": [
         {
-          "begin": "\\s*({)",
+          "begin": "\\s*(\\{)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.operation.graphql"
@@ -734,7 +734,7 @@
                   "name": "variable.arguments.graphql"
                 }
               },
-              "end": "(?=\\s*(([_A-Za-z][_0-9A-Za-z]*)\\s*(\\(|:)|(})))|\\s*(,)",
+              "end": "(?=\\s*(([_A-Za-z][_0-9A-Za-z]*)\\s*([(:])|(})))|\\s*(,)",
               "endCaptures": {
                 "5": {
                   "name": "punctuation.comma.graphql"
@@ -798,7 +798,7 @@
       ]
     },
     "graphql-selection-set": {
-      "begin": "\\s*({)",
+      "begin": "\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.operation.graphql"
@@ -842,7 +842,7 @@
       ]
     },
     "graphql-skip-newlines": {
-      "match": "\\s*\n"
+      "match": "\\s*\\n"
     },
     "graphql-string-content": {
       "patterns": [
@@ -851,7 +851,7 @@
           "name": "constant.character.escape.graphql"
         },
         {
-          "match": "\\\\u([0-9a-fA-F]{4})",
+          "match": "\\\\u(\\h{4})",
           "name": "constant.character.escape.graphql"
         }
       ]
@@ -867,7 +867,7 @@
         }
       },
       "contentName": "string.quoted.double.graphql",
-      "end": "\\s*+(?:((\"))|(\n))",
+      "end": "\\s*+(?:((\"))|(\\n))",
       "endCaptures": {
         "1": {
           "name": "string.quoted.double.graphql"
@@ -895,7 +895,7 @@
           "name": "variable.graphql"
         }
       },
-      "end": "(?=\\s*(([_A-Za-z][_0-9A-Za-z]*)\\s*(\\(|:)|(})))|\\s*(,)",
+      "end": "(?=\\s*(([_A-Za-z][_0-9A-Za-z]*)\\s*([(:])|(})))|\\s*(,)",
       "endCaptures": {
         "5": {
           "name": "punctuation.comma.graphql"
@@ -961,7 +961,7 @@
               "name": "keyword.implements.graphql"
             }
           },
-          "end": "\\s*(?={)",
+          "end": "\\s*(?=\\{)",
           "patterns": [
             {
               "captures": {
@@ -1015,7 +1015,7 @@
       ]
     },
     "graphql-type-object": {
-      "begin": "\\s*({)",
+      "begin": "\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.operation.graphql"
@@ -1173,7 +1173,7 @@
           "name": "punctuation.assignment.graphql"
         }
       },
-      "end": "(?=[\n,)])",
+      "end": "(?=[\\n,)])",
       "patterns": [
         {
           "include": "#graphql-value"
@@ -1187,7 +1187,7 @@
           "name": "variable.parameter.graphql"
         }
       },
-      "end": "(?=\\s*((\\$?[_A-Za-z][_0-9A-Za-z]*)\\s*(\\(|:)|(}|\\))))|\\s*(,)",
+      "end": "(?=\\s*((\\$?[_A-Za-z][_0-9A-Za-z]*)\\s*([(:])|([})])))|\\s*(,)",
       "endCaptures": {
         "5": {
           "name": "punctuation.comma.graphql"
@@ -1259,7 +1259,7 @@
       "match": "\\s*(\\$[_A-Za-z][_0-9A-Za-z]*)"
     },
     "native-interpolation": {
-      "begin": "\\s*(\\${)",
+      "begin": "\\s*(\\$\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.substitution.begin"

package/grammars/groovy.json

@@ -115,7 +115,7 @@
           "name": "punctuation.terminator.groovy"
         }
       },
-      "match": "^\\s*(import)(?:\\s+(static)\\s+)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
+      "match": "^\\s*(import)\\s+(static)\\s+\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
       "name": "meta.import.groovy"
     },
     {
@@ -176,7 +176,7 @@
           "name": "keyword.control.new.groovy"
         }
       },
-      "end": "(?<=\\)|\\])(?!\\s*{)|(?<=})|(?=[;])|$",
+      "end": "(?<=[)\\]])(?!\\s*\\{)|(?<=})|(?=;)|$",
       "patterns": [
         {
           "begin": "(\\w+)\\s*(?=\\[)",
@@ -185,11 +185,11 @@
               "name": "storage.type.groovy"
             }
           },
-          "end": "}|(?=\\s*(?:,|;|\\)))|$",
+          "end": "}|(?=\\s*[,;)])|$",
           "patterns": [
             {
               "begin": "\\[",
-              "end": "\\]",
+              "end": "]",
               "patterns": [
                 {
                   "include": "#groovy"
@@ -197,7 +197,7 @@
               ]
             },
             {
-              "begin": "{",
+              "begin": "\\{",
               "end": "(?=})",
               "patterns": [
                 {
@@ -231,7 +231,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "}",
           "name": "meta.inner-class.groovy",
           "patterns": [
@@ -244,7 +244,7 @@
     },
     "braces": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#groovy-code"
@@ -252,7 +252,7 @@
       ]
     },
     "class": {
-      "begin": "(?=\\w?[\\w\\s]*(?:class|(?:@)?interface|enum)\\s+\\w+)",
+      "begin": "(?=\\w?[\\w\\s]*(?:class|@?interface|enum)\\s+\\w+)",
       "end": "}",
       "endCaptures": {
         "0": {
@@ -276,7 +276,7 @@
               "name": "entity.name.type.class.groovy"
             }
           },
-          "match": "(class|(?:@)?interface|enum)\\s+(\\w+)",
+          "match": "(class|@?interface|enum)\\s+(\\w+)",
           "name": "meta.class.identifier.groovy"
         },
         {
@@ -286,7 +286,7 @@
               "name": "storage.modifier.extends.groovy"
             }
           },
-          "end": "(?={|implements)",
+          "end": "(?=\\{|implements)",
           "name": "meta.definition.class.inherited.classes.groovy",
           "patterns": [
             {
@@ -316,7 +316,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "(?=})",
           "name": "meta.class.body.groovy",
           "patterns": [
@@ -342,10 +342,10 @@
     },
     "closures": {
       "begin": "\\{(?=.*?->)",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
-          "begin": "(?<=\\{)(?=[^\\}]*?->)",
+          "begin": "(?<=\\{)(?=[^}]*?->)",
           "end": "->",
           "endCaptures": {
             "0": {
@@ -389,7 +389,7 @@
         },
         {
           "begin": "(?=[^}])",
-          "end": "(?=\\})",
+          "end": "(?=})",
           "patterns": [
             {
               "include": "#groovy-code"
@@ -461,13 +461,13 @@
     "enum-values": {
       "patterns": [
         {
-          "begin": "(?<=;|^)\\s*\\b([A-Z0-9_]+)(?=\\s*(?:,|;|}|\\(|$))",
+          "begin": "(?<=;|^)\\s*\\b([A-Z0-9_]+)(?=\\s*(?:[,;}(]|$))",
           "beginCaptures": {
             "1": {
               "name": "constant.enum.name.groovy"
             }
           },
-          "end": ",|;|(?=})|^(?!\\s*\\w+\\s*(?:,|$))",
+          "end": "[,;]|(?=})|^(?!\\s*\\w+\\s*(?:,|$))",
           "patterns": [
             {
               "begin": "\\(",
@@ -606,7 +606,7 @@
               "name": "keyword.control.assert.groovy"
             }
           },
-          "end": "$|;|}",
+          "end": "$|[;}]",
           "name": "meta.declaration.assertion.groovy",
           "patterns": [
             {
@@ -635,11 +635,11 @@
           "name": "keyword.operator.in.groovy"
         },
         {
-          "match": "\\?\\:",
+          "match": "\\?:",
           "name": "keyword.operator.elvis.groovy"
         },
         {
-          "match": "\\*\\:",
+          "match": "\\*:",
           "name": "keyword.operator.spreadmap.groovy"
         },
         {
@@ -647,7 +647,7 @@
           "name": "keyword.operator.range.groovy"
         },
         {
-          "match": "\\->",
+          "match": "->",
           "name": "keyword.operator.arrow.groovy"
         },
         {
@@ -669,7 +669,7 @@
               "name": "keyword.operator.ternary.groovy"
             }
           },
-          "end": "(?=$|\\)|}|])",
+          "end": "(?=$|[)}\\]])",
           "name": "meta.evaluation.ternary.groovy",
           "patterns": [
             {
@@ -694,7 +694,7 @@
           "name": "keyword.operator.instanceof.groovy"
         },
         {
-          "match": "(===|==|!=|<=|>=|<=>|<>|<|>|<<)",
+          "match": "(===|==|!=|<=|>=|<=>|<>|[<>]|<<)",
           "name": "keyword.operator.comparison.groovy"
         },
         {
@@ -702,11 +702,11 @@
           "name": "keyword.operator.assignment.groovy"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
+          "match": "(--|\\+\\+)",
           "name": "keyword.operator.increment-decrement.groovy"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%)",
+          "match": "([\\-+*/%])",
           "name": "keyword.operator.arithmetic.groovy"
         },
         {
@@ -774,7 +774,7 @@
           "include": "#annotations"
         },
         {
-          "begin": "(?=(?:\\w|<)[^\\(]*\\s+(?:[\\w$]|<)+\\s*\\()",
+          "begin": "(?=[\\w<][^(]*\\s+[\\w$<]+\\s*\\()",
           "end": "(?=[\\w$]+\\s*\\()",
           "name": "meta.method.return-type.java",
           "patterns": [
@@ -803,7 +803,7 @@
               "patterns": [
                 {
                   "begin": "(?=[^,)])",
-                  "end": "(?=,|\\))",
+                  "end": "(?=[,)])",
                   "name": "meta.method.parameter.groovy",
                   "patterns": [
                     {
@@ -817,7 +817,7 @@
                           "name": "keyword.operator.assignment.groovy"
                         }
                       },
-                      "end": "(?=,|\\))",
+                      "end": "(?=[,)])",
                       "name": "meta.parameter.default.groovy",
                       "patterns": [
                         {
@@ -862,7 +862,7 @@
               "name": "storage.modifier.groovy"
             }
           },
-          "end": "(?={|;)|^(?=\\s*(?:[^{\\s]|$))",
+          "end": "(?=[{;])|^(?=\\s*(?:[^{\\s]|$))",
           "name": "meta.throwables.groovy",
           "patterns": [
             {
@@ -871,7 +871,7 @@
           ]
         },
         {
-          "begin": "{",
+          "begin": "\\{",
           "end": "(?=})",
           "name": "meta.method.body.java",
           "patterns": [
@@ -884,7 +884,7 @@
     },
     "methods": {
       "applyEndPatternLast": 1,
-      "begin": "(?:(?<=;|^|{)(?=\\s*(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)|(?:def)|(?:(?:(?:void|boolean|byte|char|short|int|float|long|double)|(?:@?(?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*))[\\[\\]]*(?:<.*>)?))\\s+([^=]+\\s+)?\\w+\\s*\\())",
+      "begin": "(?<=;|^|\\{)(?=\\s*(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)|def|(?:(?:void|boolean|byte|char|short|int|float|long|double)|@?(?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*)[\\[\\]]*(?:<.*>)?)\\s+([^=]+\\s+)?\\w+\\s*\\()",
       "end": "}|(?=[^{])",
       "name": "meta.definition.method.groovy",
       "patterns": [
@@ -900,7 +900,7 @@
           "name": "punctuation.section.scope.groovy"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#nest_curly"
@@ -910,7 +910,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "((0(x|X)[0-9a-fA-F]*)|(\\+|-)?\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDdg]|UL|ul)?\\b",
+          "match": "((0([xX])\\h*)|([+\\-])?\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+\\-])?[0-9]+)?)([LlFfUuDdg]|UL|ul)?\\b",
           "name": "constant.numeric.groovy"
         }
       ]
@@ -919,7 +919,7 @@
       "patterns": [
         {
           "begin": "\\b((?:[a-z]\\w*\\.)*(?:[A-Z]+\\w*[a-z]+\\w*|UR[LI]))<",
-          "end": ">|[^\\w\\s,\\?<\\[\\]]",
+          "end": "[>[^\\w\\s,?<\\[\\]]]",
           "name": "storage.type.generic.groovy",
           "patterns": [
             {
@@ -927,7 +927,7 @@
             },
             {
               "begin": "<",
-              "end": ">|[^\\w\\s,\\[\\]<]",
+              "end": "[>[^\\w\\s,\\[\\]<]]",
               "name": "storage.type.generic.groovy"
             }
           ]
@@ -939,7 +939,7 @@
           "patterns": [
             {
               "begin": "\\[",
-              "end": "\\]",
+              "end": "]",
               "patterns": [
                 {
                   "include": "#groovy"
@@ -958,7 +958,7 @@
       "patterns": [
         {
           "begin": "\\b((?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*[a-z]+\\w*)<",
-          "end": ">|[^\\w\\s,\\?<\\[\\]]",
+          "end": "[>[^\\w\\s,?<\\[\\]]]",
           "name": "entity.other.inherited-class.groovy",
           "patterns": [
             {
@@ -966,7 +966,7 @@
             },
             {
               "begin": "<",
-              "end": ">|[^\\w\\s,\\[\\]<]",
+              "end": "[>[^\\w\\s,\\[\\]<]]",
               "name": "storage.type.generic.groovy"
             }
           ]
@@ -1011,7 +1011,7 @@
     "primitive-arrays": {
       "patterns": [
         {
-          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b",
+          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[])*\\b",
           "name": "storage.type.primitive.array.groovy"
         }
       ]
@@ -1073,7 +1073,7 @@
     "storage-modifiers": {
       "patterns": [
         {
-          "match": "\\b(private|protected|public)\\b",
+          "match": "\\b(p(?:rivate|rotected|ublic))\\b",
           "name": "storage.modifier.access-control.groovy"
         },
         {
@@ -1139,7 +1139,7 @@
               "name": "punctuation.section.embedded.groovy"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "source.groovy.embedded.source",
           "patterns": [
             {
@@ -1243,7 +1243,7 @@
           "name": "punctuation.definition.structure.begin.groovy"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.structure.end.groovy"
@@ -1318,7 +1318,7 @@
       "applyEndPatternLast": 1,
       "patterns": [
         {
-          "begin": "(?:(?=(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)|(?:def)|(?:void|boolean|byte|char|short|int|float|long|double)|(?:(?:[a-z]\\w*\\.)*[A-Z]+\\w*))\\s+[\\w\\d_<>\\[\\],\\s]+(?:=|$)))",
+          "begin": "(?=(?:(?:private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)|def|(?:void|boolean|byte|char|short|int|float|long|double)|(?:[a-z]\\w*\\.)*[A-Z]+\\w*)\\s+[\\w\\d_<>\\[\\],\\s]+(?:=|$))",
           "end": ";|$",
           "name": "meta.definition.variable.groovy",
           "patterns": [
@@ -1331,7 +1331,7 @@
                   "name": "constant.variable.groovy"
                 }
               },
-              "match": "([A-Z_0-9]+)\\s+(?=\\=)"
+              "match": "([A-Z_0-9]+)\\s+(?==)"
             },
             {
               "captures": {
@@ -1339,7 +1339,7 @@
                   "name": "meta.definition.variable.name.groovy"
                 }
               },
-              "match": "(\\w[^\\s,]*)\\s+(?=\\=)"
+              "match": "(\\w[^\\s,]*)\\s+(?==)"
             },
             {
               "begin": "=",