tm-grammars 1.22.3 → 1.22.5

package/grammars/nix.json

@@ -21,7 +21,7 @@
       ]
     },
     "attribute-bind-from-equals": {
-      "begin": "=",
+      "begin": "\\=",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.bind.nix"
@@ -88,7 +88,7 @@
           ]
         },
         {
-          "begin": "(?=[a-zA-Z_])",
+          "begin": "(?=[a-zA-Z\\_])",
           "end": "(?=\\;)",
           "patterns": [
             {
@@ -110,7 +110,7 @@
     "attribute-name": {
       "patterns": [
         {
-          "match": "\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*",
+          "match": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
           "name": "entity.other.attribute-name.multipart.nix"
         },
         {
@@ -125,7 +125,7 @@
       ]
     },
     "attribute-name-single": {
-      "match": "\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*",
+      "match": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
       "name": "entity.other.attribute-name.single.nix"
     },
     "attrset-contents": {
@@ -257,7 +257,7 @@
       "end": "(?=([\\])};]|\\b(else|then)\\b))",
       "patterns": [
         {
-          "begin": "(?=(\\s*\\}|\\\"|\\binherit\\b|\\$\\{|\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*(\\s*\\.|\\s*=[^=])))",
+          "begin": "(?=(\\s*\\}|\\\"|\\binherit\\b|\\$\\{|\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*(\\s*\\.|\\s*=[^=])))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -266,7 +266,7 @@
           ]
         },
         {
-          "begin": "(?=(\\.\\.\\.|\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*\\s*[,?]))",
+          "begin": "(?=(\\.\\.\\.|\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*\\s*[,?]))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -278,7 +278,7 @@
           "include": "#bad-reserved"
         },
         {
-          "begin": "\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*",
+          "begin": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
           "beginCaptures": {
             "0": {
               "name": "variable.parameter.function.maybe.nix"
@@ -310,7 +310,7 @@
               ]
             },
             {
-              "begin": "(?==)",
+              "begin": "(?=\\=)",
               "end": "(?=([\\])};,]|\\b(else|then)\\b))",
               "patterns": [
                 {
@@ -388,7 +388,7 @@
           "name": "markup.bold.comment.nix"
         }
       },
-      "match": "(TODO|FIXME|BUG|!!!):?"
+      "match": "(TODO|FIXME|BUG|\\!\\!\\!):?"
     },
     "constants": {
       "patterns": [
@@ -421,7 +421,7 @@
           ]
         },
         {
-          "begin": "\\b\\d+\\b",
+          "begin": "\\b[0-9]+\\b",
           "beginCaptures": {
             "0": {
               "name": "constant.numeric.nix"
@@ -511,7 +511,7 @@
           "include": "#attrset-or-function"
         },
         {
-          "match": "(\\bor\\b|\\.|==|!=|!|<=|<|>=|>|&&|\\|\\||->|//|\\?|\\+\\+|-|\\*|/(?=([^*]|$))|\\+)",
+          "match": "(\\bor\\b|\\.|==|!=|!|\\<\\=|\\<|\\>\\=|\\>|&&|\\|\\||-\\>|//|\\?|\\+\\+|-|\\*|/(?=([^*]|$))|\\+)",
           "name": "keyword.operator.nix"
         },
         {
@@ -529,7 +529,7 @@
       ]
     },
     "function-body": {
-      "begin": "(@\\s*([a-zA-Z_][a-zA-Z0-9_\\'\\-]*)\\s*)?(:)",
+      "begin": "(@\\s*([a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*)\\s*)?(\\:)",
       "end": "(?=([\\])};,]|\\b(else|then)\\b))",
       "patterns": [
         {
@@ -538,7 +538,7 @@
       ]
     },
     "function-body-from-colon": {
-      "begin": "(:)",
+      "begin": "(\\:)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.function.nix"
@@ -573,20 +573,20 @@
         },
         {
           "begin": "(?=.?)",
-          "end": "(?=:)",
+          "end": "(?=\\:)",
           "patterns": [
             {
-              "begin": "(\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*)",
+              "begin": "(\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.parameter.function.4.nix"
                 }
               },
-              "end": "(?=:)",
+              "end": "(?=\\:)",
               "patterns": [
                 {
                   "begin": "\\@",
-                  "end": "(?=:)",
+                  "end": "(?=\\:)",
                   "patterns": [
                     {
                       "include": "#function-header-until-colon-no-arg"
@@ -603,7 +603,7 @@
             },
             {
               "begin": "(?=\\{)",
-              "end": "(?=:)",
+              "end": "(?=\\:)",
               "patterns": [
                 {
                   "include": "#function-header-until-colon-with-arg"
@@ -626,7 +626,7 @@
         },
         {
           "begin": "(?=.?)",
-          "end": "(?=:)",
+          "end": "(?=\\:)",
           "patterns": [
             {
               "include": "#function-header-close-brace-with-arg"
@@ -650,7 +650,7 @@
     "function-for-sure": {
       "patterns": [
         {
-          "begin": "(?=(\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*\\s*[:@]|\\{[^}]*\\}\\s*:|\\{[^#}\"'/=]*[,?]))",
+          "begin": "(?=(\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*\\s*[:@]|\\{[^}]*\\}\\s*:|\\{[^#}\"'/=]*[,\\?]))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -667,7 +667,7 @@
           "name": "punctuation.definition.entity.function.nix"
         }
       },
-      "end": "(?=:)",
+      "end": "(?=\\:)",
       "patterns": [
         {
           "include": "#others"
@@ -681,7 +681,7 @@
           "name": "punctuation.definition.entity.function.nix"
         }
       },
-      "end": "(?=:)",
+      "end": "(?=\\:)",
       "patterns": [
         {
           "include": "#function-header-terminal-arg"
@@ -707,15 +707,15 @@
     },
     "function-header-terminal-arg": {
       "begin": "(?=@)",
-      "end": "(?=:)",
+      "end": "(?=\\:)",
       "patterns": [
         {
           "begin": "\\@",
-          "end": "(?=:)",
+          "end": "(?=\\:)",
           "patterns": [
             {
-              "begin": "(\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*)",
-              "end": "(?=:)",
+              "begin": "(\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*)",
+              "end": "(?=\\:)",
               "name": "variable.parameter.function.3.nix"
             },
             {
@@ -730,7 +730,7 @@
     },
     "function-header-until-colon-no-arg": {
       "begin": "(?=\\{)",
-      "end": "(?=:)",
+      "end": "(?=\\:)",
       "patterns": [
         {
           "include": "#function-header-open-brace"
@@ -742,7 +742,7 @@
     },
     "function-header-until-colon-with-arg": {
       "begin": "(?=\\{)",
-      "end": "(?=:)",
+      "end": "(?=\\:)",
       "patterns": [
         {
           "include": "#function-header-open-brace"
@@ -765,7 +765,7 @@
           ]
         },
         {
-          "begin": "\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*",
+          "begin": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
           "beginCaptures": {
             "0": {
               "name": "variable.parameter.function.1.nix"
@@ -1016,10 +1016,10 @@
           "name": "variable.parameter.name.nix"
         }
       },
-      "match": "\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*"
+      "match": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*"
     },
     "parameter-name-and-cont": {
-      "begin": "\\b[a-zA-Z_][a-zA-Z0-9_\\'\\-]*",
+      "begin": "\\b[a-zA-Z\\_][a-zA-Z0-9\\_\\'\\-]*",
       "beginCaptures": {
         "0": {
           "name": "variable.parameter.name.nix"
@@ -1111,7 +1111,7 @@
           ]
         },
         {
-          "begin": "(~?[a-zA-Z0-9\\._\\-+]*(\\/[a-zA-Z0-9\\._\\-+]+)+)",
+          "begin": "(~?[a-zA-Z0-9\\.\\_\\-\\+]*(\\/[a-zA-Z0-9\\.\\_\\-\\+]+)+)",
           "beginCaptures": {
             "0": {
               "name": "string.unquoted.path.nix"
@@ -1125,7 +1125,7 @@
           ]
         },
         {
-          "begin": "(<[a-zA-Z0-9\\._\\-+]+(\\/[a-zA-Z0-9\\._\\-+]+)*>)",
+          "begin": "(\\<[a-zA-Z0-9\\.\\_\\-\\+]+(\\/[a-zA-Z0-9\\.\\_\\-\\+]+)*\\>)",
           "beginCaptures": {
             "0": {
               "name": "string.unquoted.spath.nix"
@@ -1139,7 +1139,7 @@
           ]
         },
         {
-          "begin": "([a-zA-Z][a-zA-Z0-9+\\-\\.]*:[a-zA-Z0-9\\%\\/?:\\@\\&=+$\\,\\-_\\.!\\~\\*\\']+)",
+          "begin": "([a-zA-Z][a-zA-Z0-9\\+\\-\\.]*\\:[a-zA-Z0-9\\%\\/\\?\\:\\@\\&\\=\\+\\$\\,\\-\\_\\.\\!\\~\\*\\']+)",
           "beginCaptures": {
             "0": {
               "name": "string.unquoted.url.nix"

package/grammars/nushell.json

@@ -161,7 +161,7 @@
       ]
     },
     "command": {
-      "begin": "(?<!\\w)(?:(\\^)|(?!\\d|\\$))([\\w.!]+(?:(?: (?!-)[\\w\\-.!]+(?:(?= |\\))|$)|[\\w\\-.!]+))*|(?<=\\^)\\$?(?:\"[^\"]+\"|'[^']+'))",
+      "begin": "(?<!\\w)(?:(\\^)|(?![0-9]|\\$))([\\w.!]+(?:(?: (?!-)[\\w\\-.!]+(?:(?= |\\))|$)|[\\w\\-.!]+))*|(?<=\\^)\\$?(?:\"[^\"]+\"|'[^']+'))",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.nushell"
@@ -617,7 +617,7 @@
       ]
     },
     "operators-symbols": {
-      "match": "(?<= )(?:(?:\\+|-|\\*|\\/)=?|\\/\\/|\\*\\*|!=|[<>=]=?|[!=]~|\\+\\+=?)(?= |$)",
+      "match": "(?<= )(?:(?:\\+|\\-|\\*|\\/)=?|\\/\\/|\\*\\*|!=|[<>=]=?|[!=]~|\\+\\+=?)(?= |$)",
       "name": "keyword.control.nushell"
     },
     "operators-word": {
@@ -1060,7 +1060,7 @@
           "name": "variable.other.nushell"
         }
       },
-      "match": "(\\$\\w+)((?:\\.(?:[\\w-]+|\"[\\w\\- ]+\"))*)"
+      "match": "(\\$[a-zA-Z0-9_]+)((?:\\.(?:[\\w-]+|\"[\\w\\- ]+\"))*)"
     }
   },
   "scopeName": "source.nushell"

package/grammars/objective-c.json

@@ -911,7 +911,7 @@
           "include": "#line_continuation_character"
         },
         {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!\\])",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objc"
@@ -948,7 +948,7 @@
       ],
       "repository": {
         "access-method": {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objc"
@@ -1554,7 +1554,7 @@
                   "name": "keyword.operator.plus.exponent.hexadecimal.objc"
                 }
               },
-              "match": "(\\G0[xX])(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([pP])(\\+)?(-)?((?-mix:(?:\\d(?:(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1607,7 +1607,7 @@
                   "name": "keyword.operator.plus.exponent.decimal.objc"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(?:(\\d(?:(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=\\d)\\.|\\.(?=\\d)))(?:(\\d(?:(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([eE])(\\+)?(-)?((?-mix:(?:\\d(?:(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9])\\.|\\.(?=[0-9])))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1694,7 +1694,7 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G0[xX])([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([pP])(\\+)?(-)?((?-mix:(?:\\d(?:(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1732,7 +1732,7 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(\\d(?:(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([eE])(\\+)?(-)?((?-mix:(?:\\d(?:(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
             },
             {
               "match": "(?:(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))+",
@@ -2035,7 +2035,7 @@
         "preprocessor-rule-conditional-line": {
           "patterns": [
             {
-              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|:|&&|\\|\\||\\\\\\s*\\n)))",
+              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
               "name": "keyword.control.directive.conditional.objc"
             },
             {
@@ -2967,7 +2967,7 @@
               "name": "variable.parameter.probably.objc"
             }
           },
-          "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\])]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
+          "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\]\\)]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
         },
         "static_assert": {
           "begin": "(static_assert|_Static_assert)\\s*(\\()",

package/grammars/objective-cpp.json

@@ -914,7 +914,7 @@
           "include": "#line_continuation_character"
         },
         {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!\\])",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objcpp"
@@ -951,7 +951,7 @@
       ],
       "repository": {
         "access-method": {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.object.objcpp"
@@ -1557,7 +1557,7 @@
                   "name": "keyword.operator.plus.exponent.hexadecimal.objcpp"
                 }
               },
-              "match": "(\\G0[xX])(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([pP])(\\+)?(-)?((?-mix:(?:\\d(?:(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))(?:([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1610,7 +1610,7 @@
                   "name": "keyword.operator.plus.exponent.decimal.objcpp"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(?:(\\d(?:(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=\\d)\\.|\\.(?=\\d)))(?:(\\d(?:(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([eE])(\\+)?(-)?((?-mix:(?:\\d(?:(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?((?:(?<=[0-9])\\.|\\.(?=[0-9])))(?:([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*))?(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:([lLfF](?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1697,7 +1697,7 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G0[xX])([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([pP])(\\+)?(-)?((?-mix:(?:\\d(?:(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G0[xX])([0-9a-fA-F](?:(?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([pP])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1735,7 +1735,7 @@
                   "name": "keyword.other.unit.suffix.integer.objcpp"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))(\\d(?:(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([eE])(\\+)?(-)?((?-mix:(?:\\d(?:(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:(?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)(?:((?<!')([eE])(\\+)?(\\-)?((?-mix:(?:[0-9](?:(?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))))*)))))?(?:((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w)))?(?!(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))"
             },
             {
               "match": "(?:(?:['0-9a-zA-Z_\\.']|(?<=[eEpP])[+-]))+",
@@ -2038,7 +2038,7 @@
         "preprocessor-rule-conditional-line": {
           "patterns": [
             {
-              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|:|&&|\\|\\||\\\\\\s*\\n)))",
+              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
               "name": "keyword.control.directive.conditional.objcpp"
             },
             {
@@ -2970,7 +2970,7 @@
               "name": "variable.parameter.probably.objcpp"
             }
           },
-          "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\])]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
+          "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\]\\)]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
         },
         "static_assert": {
           "begin": "(static_assert|_Static_assert)\\s*(\\()",
@@ -4179,7 +4179,7 @@
           "include": "#line_continuation_character"
         },
         {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!\\])",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
           "beginCaptures": {
             "1": {
               "name": "variable.other.object.objcpp"
@@ -4254,7 +4254,7 @@
           "name": "variable.other.object.access.objcpp"
         },
         "access-method": {
-          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+          "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.other.object.objcpp"
@@ -4968,10 +4968,10 @@
               "name": "keyword.operator.plus.exponent.hexadecimal.objcpp"
             }
           },
-          "match": "((?<!\\w)(?:(?:(?:(0[xX])(?:([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*))?((?:(?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F]))))(?:([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*))?(?:([pP])(\\+)?(-)?((?:\\d(?:(?:(?:\\d|(?:(?<!')'(?!')))))*)))?|(?:(\\d(?:(?:(?:\\d|((?<!')'(?!')))))*))?((?:(?:(?<=\\d)\\.|\\.(?=\\d))))(?:(\\d(?:(?:(?:\\d|((?<!')'(?!')))))*))?(?:([eE])(\\+)?(-)?((?:\\d(?:(?:(?:\\d|(?:(?<!')'(?!')))))*)))?)(?:([lLfF](?!\\w)))?|(?:(?:(?:(?:(?:(0[bB])((?:(?:(?:[01]|((?<!')'(?!')))))+)|(0)((?:(?:(?:[0-7]|((?<!')'(?!')))))+)))|(0[xX])([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*)(?:([pP])(\\+)?(-)?((?:\\d(?:(?:(?:\\d|(?:(?<!')'(?!')))))*)))?))|(\\d(?:(?:(?:\\d|((?<!')'(?!')))))*)(?:([eE])(\\+)?(-)?((?:\\d(?:(?:(?:\\d|(?:(?<!')'(?!')))))*)))?)(?:((?:(?:(?:(?:(?:(?:(?:(?:(?:(?:(?:(?:LL[uU]|ll[uU]))|[uU]LL))|[uU]ll))|ll))|LL))|[uUlL]))(?!\\w)))?))(\\w*))"
+          "match": "((?<!\\w)(?:(?:(?:(0[xX])(?:([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*))?((?:(?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F]))))(?:([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*))?(?:([pP])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?|(?:([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*))?((?:(?:(?<=[0-9])\\.|\\.(?=[0-9]))))(?:([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*))?(?:([eE])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?)(?:([lLfF](?!\\w)))?|(?:(?:(?:(?:(?:(0[bB])((?:(?:(?:[01]|((?<!')'(?!')))))+)|(0)((?:(?:(?:[0-7]|((?<!')'(?!')))))+)))|(0[xX])([0-9a-fA-F](?:(?:(?:[0-9a-fA-F]|((?<!')'(?!')))))*)(?:([pP])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?))|([0-9](?:(?:(?:[0-9]|((?<!')'(?!')))))*)(?:([eE])(\\+)?(\\-)?((?:[0-9](?:(?:(?:[0-9]|(?:(?<!')'(?!')))))*)))?)(?:((?:(?:(?:(?:(?:(?:(?:(?:(?:(?:(?:(?:LL[uU]|ll[uU]))|[uU]LL))|[uU]ll))|ll))|LL))|[uUlL]))(?!\\w)))?))(\\w*))"
         },
         "operator_overload": {
-          "begin": "((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*)\\s*(operator)((?:(?:\\s*(?:\\+\\+|--|\\(\\)|\\[\\]|->|\\+\\+|--|\\+|-|!|~|\\*|&|->\\*|\\*|\\/|%|\\+|-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:(?:new|new\\[\\]|delete|delete\\[\\])|(?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*[a-zA-Z_]\\w*\\s*(?:&)?)))))\\s*(\\()",
+          "begin": "((?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*)\\s*(operator)((?:(?:\\s*(?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:(?:new|new\\[\\]|delete|delete\\[\\])|(?:[a-zA-Z_]\\w*\\s*(?:(?:<(?:[\\s<>,\\w])*>\\s*))?::)*[a-zA-Z_]\\w*\\s*(?:&)?)))))\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.scope.objcpp"
@@ -5304,7 +5304,7 @@
         "preprocessor-rule-conditional-line": {
           "patterns": [
             {
-              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|:|&&|\\|\\||\\\\\\s*\\n)))",
+              "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
               "name": "keyword.control.directive.conditional.objcpp"
             },
             {
@@ -6242,7 +6242,7 @@
               "name": "variable.parameter.probably.objcpp"
             }
           },
-          "match": "(?:(?:([a-zA-Z_]\\w*)\\s*(?==)|(?<=\\w\\s|\\*\\/|[&*>\\])])\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:(?:,|\\))))))"
+          "match": "(?:(?:([a-zA-Z_]\\w*)\\s*(?==)|(?<=\\w\\s|\\*\\/|[&*>\\]\\)])\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:(?:,|\\))))))"
         },
         "scope_resolution": {
           "captures": {