tm-grammars 1.23.3 → 1.23.5

package/grammars/java.json

@@ -203,7 +203,7 @@
           "name": "keyword.control.new.java"
         }
       },
-      "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|\\^=])",
+      "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|^=])",
       "patterns": [
         {
           "include": "#comments"
@@ -216,7 +216,7 @@
         },
         {
           "begin": "(?<=\\))",
-          "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|\\^=])",
+          "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|^=])",
           "patterns": [
             {
               "include": "#comments"
@@ -245,7 +245,7 @@
         },
         {
           "begin": "(?<=])",
-          "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|\\^=])",
+          "end": "(?=[;)\\].,?:}+\\-*]|/(?![/*])|[%!\\&|^=])",
           "patterns": [
             {
               "include": "#comments"
@@ -301,7 +301,7 @@
       ]
     },
     "class": {
-      "begin": "(?=\\w?[\\w\\s\\-]*\\b(?:class|(?<!@)interface|enum)\\s+[\\w$]+)",
+      "begin": "(?=\\w?[\\w\\s-]*\\b(?:class|(?<!@)interface|enum)\\s+[\\w$]+)",
       "end": "}",
       "endCaptures": {
         "0": {
@@ -919,11 +919,11 @@
           "name": "keyword.operator.instanceof.java"
         },
         {
-          "match": "(<<|>>>?|[~\\^])",
+          "match": "(<<|>>>?|[~^])",
           "name": "keyword.operator.bitwise.java"
         },
         {
-          "match": "(([\\&\\^|]|<<|>>>?)=)",
+          "match": "(([\\&^|]|<<|>>>?)=)",
           "name": "keyword.operator.assignment.bitwise.java"
         },
         {
@@ -931,7 +931,7 @@
           "name": "keyword.operator.comparison.java"
         },
         {
-          "match": "([+*/%\\-]=)",
+          "match": "([+*/%-]=)",
           "name": "keyword.operator.assignment.arithmetic.java"
         },
         {
@@ -943,7 +943,7 @@
           "name": "keyword.operator.increment-decrement.java"
         },
         {
-          "match": "([\\-+*/%])",
+          "match": "([-+*/%])",
           "name": "keyword.operator.arithmetic.java"
         },
         {
@@ -1144,7 +1144,7 @@
     "numbers": {
       "patterns": [
         {
-          "match": "\\b(?<!\\$)0([xX])((?<!\\.)\\h([_\\h]*\\h)?[Ll]?(?!\\.)|(\\h([_\\h]*\\h)?\\.?|(\\h([_\\h]*\\h)?)?\\.\\h([_\\h]*\\h)?)[Pp][+\\-]?[0-9]([0-9_]*[0-9])?[FfDd]?)\\b(?!\\$)",
+          "match": "\\b(?<!\\$)0([xX])((?<!\\.)\\h([_\\h]*\\h)?[Ll]?(?!\\.)|(\\h([_\\h]*\\h)?\\.?|(\\h([_\\h]*\\h)?)?\\.\\h([_\\h]*\\h)?)[Pp][+-]?[0-9]([0-9_]*[0-9])?[FfDd]?)\\b(?!\\$)",
           "name": "constant.numeric.hex.java"
         },
         {
@@ -1156,7 +1156,7 @@
           "name": "constant.numeric.octal.java"
         },
         {
-          "match": "(?<!\\$)(\\b[0-9]([0-9_]*[0-9])?\\.\\B(?!\\.)|\\b[0-9]([0-9_]*[0-9])?\\.([Ee][+\\-]?[0-9]([0-9_]*[0-9])?)[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?\\.([Ee][+\\-]?[0-9]([0-9_]*[0-9])?)?[FfDd]\\b|\\b[0-9]([0-9_]*[0-9])?\\.([0-9]([0-9_]*[0-9])?)([Ee][+\\-]?[0-9]([0-9_]*[0-9])?)?[FfDd]?\\b|(?<!\\.)\\B\\.[0-9]([0-9_]*[0-9])?([Ee][+\\-]?[0-9]([0-9_]*[0-9])?)?[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?([Ee][+\\-]?[0-9]([0-9_]*[0-9])?)[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?([Ee][+\\-]?[0-9]([0-9_]*[0-9])?)?[FfDd]\\b|\\b(0|[1-9]([0-9_]*[0-9])?)(?!\\.)[Ll]?\\b)(?!\\$)",
+          "match": "(?<!\\$)(\\b[0-9]([0-9_]*[0-9])?\\.\\B(?!\\.)|\\b[0-9]([0-9_]*[0-9])?\\.([Ee][+-]?[0-9]([0-9_]*[0-9])?)[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?\\.([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]\\b|\\b[0-9]([0-9_]*[0-9])?\\.([0-9]([0-9_]*[0-9])?)([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]?\\b|(?<!\\.)\\B\\.[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)[FfDd]?\\b|\\b[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]\\b|\\b(0|[1-9]([0-9_]*[0-9])?)(?!\\.)[Ll]?\\b)(?!\\$)",
           "name": "constant.numeric.decimal.java"
         }
       ]

package/grammars/javascript.json

@@ -1638,7 +1638,7 @@
           "name": "keyword.operator.logical.js"
         },
         {
-          "match": "[\\&~\\^|]",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.js"
         },
         {
@@ -1756,13 +1756,13 @@
       ]
     },
     "field-declaration": {
-      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,}]|$))",
+      "begin": "(?<!\\()(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s+)?(?=\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,}]|$))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.js"
         }
       },
-      "end": "(?=[};,]|$|(^(?!\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,]|$))))|(?<=})",
+      "end": "(?=[};,]|$|(^(?!\\s*((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|(#?[_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(?:(?:(\\?)|(!))\\s*)?([=:;,]|$))))|(?<=})",
       "name": "meta.field.declaration.js",
       "patterns": [
         {
@@ -2513,7 +2513,7 @@
       ]
     },
     "indexer-mapped-type-declaration": {
-      "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+\\-])?(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+      "begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?\\s*(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.type.modifier.js"
@@ -2531,7 +2531,7 @@
           "name": "keyword.operator.expression.in.js"
         }
       },
-      "end": "(])([+\\-])?\\s*(\\?\\s*)?|$",
+      "end": "(])([+-])?\\s*(\\?\\s*)?|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.square.js"
@@ -2626,7 +2626,7 @@
           "name": "keyword.operator.expression.instanceof.js"
         }
       },
-      "end": "(?<=\\))|(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?:==|!=)(?:=|))|(([\\&~\\^|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*\\())))",
+      "end": "(?<=\\))|(?=[;),}\\]:?\\-+>]|\\|\\||&&|!==|$|((?:==|!=)(?:=|))|(([\\&~^|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*\\())))",
       "patterns": [
         {
           "include": "#type"
@@ -2807,8 +2807,8 @@
       ]
     },
     "jsx-tag": {
-      "begin": "(?=(<)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
-      "end": "(/>)|(</)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))?\\s*(>)",
+      "begin": "(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "end": "(/>)|(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.js"
@@ -2835,7 +2835,7 @@
       "name": "meta.tag.js",
       "patterns": [
         {
-          "begin": "(<)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>)",
+          "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.js"
@@ -2899,7 +2899,7 @@
           "name": "entity.other.attribute-name.js"
         }
       },
-      "match": "\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(:))?([_$[:alpha:]][\\-_$[:alnum:]]*)(?=[\\s=]|/?>|/\\*|//)"
+      "match": "\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?([_$[:alpha:]][-_$[:alnum:]]*)(?=[\\s=]|/?>|/\\*|//)"
     },
     "jsx-tag-attributes": {
       "begin": "\\s+",
@@ -2934,8 +2934,8 @@
       "name": "invalid.illegal.attribute.js"
     },
     "jsx-tag-in-expression": {
-      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,))(?=(<)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
-      "end": "(?!(<)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,))(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
+      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))(?=((<\\s*)|(\\s+))(?!\\?)|/?>))",
       "patterns": [
         {
           "include": "#jsx-tag"
@@ -2943,7 +2943,7 @@
       ]
     },
     "jsx-tag-without-attributes": {
-      "begin": "(<)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))?\\s*(>)",
+      "begin": "(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.js"
@@ -2965,7 +2965,7 @@
         }
       },
       "contentName": "meta.jsx.children.js",
-      "end": "(</)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))?\\s*(>)",
+      "end": "(</)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.js"
@@ -2994,8 +2994,8 @@
       ]
     },
     "jsx-tag-without-attributes-in-expression": {
-      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))?\\s*(>))",
-      "end": "(?!(<)\\s*(?:([_$[:alpha:]][\\-_$[:alnum:].]*)(?<![.\\-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][\\-_$[:alnum:].]*))(?<![.\\-]))?\\s*(>))",
+      "begin": "(?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\*/|^await|[^._$[:alnum:]]await|^return|[^._$[:alnum:]]return|^default|[^._$[:alnum:]]default|^yield|[^._$[:alnum:]]yield|^)\\s*(?=(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>))",
+      "end": "(?!(<)\\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<![.-])(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<![.-]))?\\s*(>))",
       "patterns": [
         {
           "include": "#jsx-tag-without-attributes"
@@ -3128,7 +3128,7 @@
           ]
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(override)\\s+)?(?:\\b(p(?:ublic|rivate|rotected))\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.js"
@@ -3163,7 +3163,7 @@
       ]
     },
     "method-declaration-name": {
-      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??)\\s*[(<])",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??)\\s*[(<])",
       "end": "(?=[(<])",
       "patterns": [
         {
@@ -3315,7 +3315,7 @@
               "name": "storage.type.numeric.bigint.js"
             }
           },
-          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)"
+          "match": "(?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)"
         }
       ]
     },
@@ -3337,7 +3337,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
           "end": "(?=[,}])",
           "patterns": [
             {
@@ -3368,7 +3368,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
           "end": "(?=[,}])",
           "patterns": [
             {
@@ -3394,7 +3394,7 @@
       ]
     },
     "object-binding-element-propertyName": {
-      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+      "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
       "end": "(:)",
       "endCaptures": {
         "0": {
@@ -3518,7 +3518,7 @@
       ]
     },
     "object-literal-method-declaration": {
-      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.async.js"
@@ -3540,7 +3540,7 @@
           "include": "#function-body"
         },
         {
-          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(\\??))\\s*((<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<]|<\\s*(((const\\s+)?[_$[:alpha:]])|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*})*}))*})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*])*]))*]))([^=<>]|=[^<])*>)*>)*>\\s*))?\\()",
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.async.js"
@@ -3596,7 +3596,7 @@
           ]
         },
         {
-          "begin": "(?=(\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)))",
+          "begin": "(?=(\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$)))",
           "end": "(?=:)|(?=\\s*([(<,}])|(\\s+as|satisifies\\s+))",
           "name": "meta.object.member.js meta.object-literal.key.js",
           "patterns": [
@@ -3940,7 +3940,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+\\-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
+          "begin": "(?=((\\b(?<!\\$)0[xX]\\h[_\\h]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[bB][01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0[oO]?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b|\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(\\.)(n)?\\B|\\B(\\.)[0-9][0-9_]*(n)?\\b|\\b[0-9][0-9_]*(n)?\\b(?!\\.))(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")|(`([^`\\\\]|\\\\.)*`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*])+]))\\s*(:))",
           "end": "(?=[,}])",
           "patterns": [
             {

package/grammars/jinja.json

@@ -148,7 +148,7 @@
           "name": "variable.other.jinja"
         },
         {
-          "match": "([+\\-]|\\*\\*|\\*|//|[/%])",
+          "match": "([+-]|\\*\\*|\\*|//|[/%])",
           "name": "keyword.operator.arithmetic.jinja"
         },
         {

package/grammars/jison.json

@@ -27,19 +27,19 @@
           "name": "variable.language.result-id.jison"
         },
         {
-          "match": "\\$(?:-?\\d+|[[:alpha:]_](?:[\\w\\-]*\\w)?)",
+          "match": "\\$(?:-?\\d+|[[:alpha:]_](?:[\\w-]*\\w)?)",
           "name": "support.variable.token-value.jison"
         },
         {
-          "match": "@(?:-?\\d+|[[:alpha:]_](?:[\\w\\-]*\\w)?)",
+          "match": "@(?:-?\\d+|[[:alpha:]_](?:[\\w-]*\\w)?)",
           "name": "support.variable.token-location.jison"
         },
         {
-          "match": "##(?:-?\\d+|[[:alpha:]_](?:[\\w\\-]*\\w)?)",
+          "match": "##(?:-?\\d+|[[:alpha:]_](?:[\\w-]*\\w)?)",
           "name": "support.variable.stack-index.jison"
         },
         {
-          "match": "#(?:-?\\d+|[[:alpha:]_](?:[\\w\\-]*\\w)?)",
+          "match": "#(?:-?\\d+|[[:alpha:]_](?:[\\w-]*\\w)?)",
           "name": "support.variable.token-id.jison"
         },
         {
@@ -292,7 +292,7 @@
               "include": "#quoted_strings"
             },
             {
-              "match": "\\b[[:alpha:]_](?:[\\w\\-]*\\w)?\\b",
+              "match": "\\b[[:alpha:]_](?:[\\w-]*\\w)?\\b",
               "name": "string.unquoted.jison"
             }
           ]
@@ -314,7 +314,7 @@
               "include": "#quoted_strings"
             },
             {
-              "match": "\\b[[:alpha:]_](?:[\\w\\-]*\\w)?\\b",
+              "match": "\\b[[:alpha:]_](?:[\\w-]*\\w)?\\b",
               "name": "string.unquoted.jison"
             }
           ]
@@ -344,7 +344,7 @@
               "include": "#quoted_strings"
             },
             {
-              "match": "<[[:alpha:]_](?:[\\w\\-]*\\w)?>",
+              "match": "<[[:alpha:]_](?:[\\w-]*\\w)?>",
               "name": "invalid.unimplemented.jison"
             },
             {
@@ -362,7 +362,7 @@
           "name": "invalid.illegal.jison"
         },
         {
-          "match": "%[[:alpha:]_](?:[\\w\\-]*\\w)?\\b",
+          "match": "%[[:alpha:]_](?:[\\w-]*\\w)?\\b",
           "name": "invalid.unimplemented.jison"
         },
         {
@@ -454,7 +454,7 @@
               "include": "#comments"
             },
             {
-              "match": "\\b[[:alpha:]_](?:[\\w\\-]*\\w)?\\b",
+              "match": "\\b[[:alpha:]_](?:[\\w-]*\\w)?\\b",
               "name": "entity.name.constant.jison"
             },
             {
@@ -575,7 +575,7 @@
           "include": "#include_declarations"
         },
         {
-          "begin": "\\b[[:alpha:]_](?:[\\w\\-]*\\w)?\\b",
+          "begin": "\\b[[:alpha:]_](?:[\\w-]*\\w)?\\b",
           "beginCaptures": {
             "0": {
               "name": "entity.name.constant.rule-result.jison"
@@ -620,7 +620,7 @@
                       "name": "punctuation.definition.named-reference.end.jison"
                     }
                   },
-                  "match": "(\\[)([[:alpha:]_](?:[\\w\\-]*\\w)?)(])"
+                  "match": "(\\[)([[:alpha:]_](?:[\\w-]*\\w)?)(])"
                 },
                 {
                   "begin": "(%(prec))\\s*",

package/grammars/json.json

@@ -73,7 +73,7 @@
       "name": "constant.language.json"
     },
     "number": {
-      "match": "-?(?:0|[1-9]\\d*)(?:(?:\\.\\d+)?(?:[eE][+\\-]?\\d+)?)?",
+      "match": "-?(?:0|[1-9]\\d*)(?:(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)?",
       "name": "constant.numeric.json"
     },
     "object": {

package/grammars/json5.json

@@ -90,7 +90,7 @@
           "include": "#stringDouble"
         },
         {
-          "match": "[a-zA-Z0-9_\\-]",
+          "match": "[a-zA-Z0-9_-]",
           "name": "string.key.json5"
         }
       ]
@@ -102,7 +102,7 @@
           "name": "constant.hex.numeric.json5"
         },
         {
-          "match": "[+-.]?(?=[1-9]|0(?!\\d))\\d+(\\.\\d+)?([eE][+\\-]?\\d+)?",
+          "match": "[+-.]?(?=[1-9]|0(?!\\d))\\d+(\\.\\d+)?([eE][+-]?\\d+)?",
           "name": "constant.dec.numeric.json5"
         }
       ]

package/grammars/jsonc.json

@@ -73,7 +73,7 @@
       "name": "constant.language.json.comments"
     },
     "number": {
-      "match": "-?(?:0|[1-9]\\d*)(?:(?:\\.\\d+)?(?:[eE][+\\-]?\\d+)?)?",
+      "match": "-?(?:0|[1-9]\\d*)(?:(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)?",
       "name": "constant.numeric.json.comments"
     },
     "object": {

package/grammars/jsonl.json

@@ -73,7 +73,7 @@
       "name": "constant.language.json.lines"
     },
     "number": {
-      "match": "-?(?:0|[1-9]\\d*)(?:(?:\\.\\d+)?(?:[eE][+\\-]?\\d+)?)?",
+      "match": "-?(?:0|[1-9]\\d*)(?:(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)?",
       "name": "constant.numeric.json.lines"
     },
     "object": {

package/grammars/jsonnet.json

@@ -129,7 +129,7 @@
     "keywords": {
       "patterns": [
         {
-          "match": "[!:~+\\-\\&|\\^=<>*/%]",
+          "match": "[!:~+\\-\\&|^=<>*/%]",
           "name": "keyword.operator.jsonnet"
         },
         {
@@ -169,15 +169,15 @@
           "name": "constant.language.jsonnet"
         },
         {
-          "match": "\\b(\\d+([Ee][+\\-]?\\d+)?)\\b",
+          "match": "\\b(\\d+([Ee][+-]?\\d+)?)\\b",
           "name": "constant.numeric.jsonnet"
         },
         {
-          "match": "\\b\\d+\\.\\d*([Ee][+\\-]?\\d+)?\\b",
+          "match": "\\b\\d+\\.\\d*([Ee][+-]?\\d+)?\\b",
           "name": "constant.numeric.jsonnet"
         },
         {
-          "match": "\\b\\.\\d+([Ee][+\\-]?\\d+)?\\b",
+          "match": "\\b\\.\\d+([Ee][+-]?\\d+)?\\b",
           "name": "constant.numeric.jsonnet"
         }
       ]