tm-grammars 1.22.2 → 1.22.4

package/grammars/shellscript.json

@@ -8,7 +8,7 @@
   ],
   "repository": {
     "alias_statement": {
-      "begin": "(?:(?:[ \\t]*+)(alias)(?:[ \\t]*+)((?:(?:((?<!\\w)-\\w+\\b)(?:[ \\t]*+))*))(?:(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(=)|(\\+=))|(-=))))",
+      "begin": "(?:(?:[ \\t]*+)(alias)(?:[ \\t]*+)((?:(?:((?<!\\w)-\\w+\\b)(?:[ \\t]*+))*))(?:(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(\\=)|(\\+\\=))|(\\-\\=))))",
       "beginCaptures": {
         "1": {
           "name": "storage.type.alias.shell"
@@ -116,7 +116,7 @@
               ]
             }
           },
-          "match": "(?:[ \\t]*+)((?:[^ \\t\\n>&;<>()$`\\\\\"'<\\|]+)(?!>))"
+          "match": "(?:[ \\t]*+)((?:[^ \t\n>&;<>\\(\\)\\$`\\\\\"'<\\|]+)(?!>))"
         },
         {
           "include": "#normal_context"
@@ -202,7 +202,7 @@
       "match": "(?:(\\[)([^\\[\\]]+)(\\]))"
     },
     "array_value": {
-      "begin": "(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(=)|(\\+=))|(-=))(?:[ \\t]*+)(\\()",
+      "begin": "(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(\\=)|(\\+\\=))|(\\-\\=))(?:[ \\t]*+)(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.other.assignment.shell"
@@ -251,7 +251,7 @@
               "name": "keyword.operator.assignment.shell punctuation.definition.assignment.shell"
             }
           },
-          "match": "(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(=))"
+          "match": "(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(\\=))"
         },
         {
           "captures": {
@@ -268,7 +268,7 @@
               "name": "punctuation.definition.assignment.shell"
             }
           },
-          "match": "(?:(\\[)(.+?)(\\])(=))"
+          "match": "(?:(\\[)(.+?)(\\])(\\=))"
         },
         {
           "include": "#normal_context"
@@ -485,7 +485,7 @@
           "include": "#string"
         },
         {
-          "match": "[^) \\t\\n\\[?\\*\\|\\@]",
+          "match": "[^) \\t\\n\\[\\?\\*\\|\\@]",
           "name": "string.unquoted.pattern.shell string.regexp.unquoted.shell"
         }
       ]
@@ -516,7 +516,7 @@
               "name": "entity.name.function.call.shell entity.name.command.shell"
             }
           },
-          "match": "(?:(?<!\\w)(?<=\\G|'|\"|\\}|\\))([^ \\n\\t\\r\"'=;&\\|`){<>]+))"
+          "match": "(?:(?<!\\w)(?<=\\G|'|\"|\\}|\\))([^ \\n\\t\\r\"'=;&\\|`\\)\\{<>]+))"
         },
         {
           "begin": "(?:(?:\\G|(?<! |\\t|;|\\||&|\\n|\\{|#))(?:(\\$?)((?:(\")|(')))))",
@@ -669,7 +669,7 @@
       },
       "patterns": [
         {
-          "match": "\\\\[$\\n`\"\\\\]",
+          "match": "\\\\[\\$\\n`\"\\\\]",
           "name": "constant.character.escape.shell"
         },
         {
@@ -703,7 +703,7 @@
     "double_quote_context": {
       "patterns": [
         {
-          "match": "\\\\[$`\"\\\\\\n]",
+          "match": "\\\\[\\$`\"\\\\\\n]",
           "name": "constant.character.escape.shell"
         },
         {
@@ -715,7 +715,7 @@
       ]
     },
     "double_quote_escape_char": {
-      "match": "\\\\[$`\"\\\\\\n]",
+      "match": "\\\\[\\$`\"\\\\\\n]",
       "name": "constant.character.escape.shell"
     },
     "floating_keyword": {
@@ -781,7 +781,7 @@
     },
     "function_definition": {
       "applyEndPatternLast": 1,
-      "begin": "(?:[ \\t]*+)(?:(?:(\\bfunction\\b)(?:[ \\t]*+)([^ \\t\\n\\r()=\"']+)(?:(?:(\\()(?:[ \\t]*+)(\\)))?))|(?:([^ \\t\\n\\r()=\"']+)(?:[ \\t]*+)(\\()(?:[ \\t]*+)(\\))))",
+      "begin": "(?:[ \\t]*+)(?:(?:(\\bfunction\\b)(?:[ \\t]*+)([^ \\t\\n\\r\\(\\)=\"']+)(?:(?:(\\()(?:[ \\t]*+)(\\)))?))|(?:([^ \\t\\n\\r\\(\\)=\"']+)(?:[ \\t]*+)(\\()(?:[ \\t]*+)(\\))))",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.shell"
@@ -1496,7 +1496,7 @@
           "include": "#variable"
         },
         {
-          "match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|\\?|:|,|=|[*/%+\\-&^|]=|<<=|>>=",
+          "match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|\\?|\\:|,|=|[*/%+\\-&^|]=|<<=|>>=",
           "name": "keyword.operator.arithmetic.shell"
         },
         {
@@ -1528,7 +1528,7 @@
     "math_operators": {
       "patterns": [
         {
-          "match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|\\?|:|,|=|[*/%+\\-&^|]=|<<=|>>=",
+          "match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|\\?|\\:|,|=|[*/%+\\-&^|]=|<<=|>>=",
           "name": "keyword.operator.arithmetic.shell"
         },
         {
@@ -1646,7 +1646,7 @@
               "name": "constant.numeric.shell constant.numeric.hex.shell"
             }
           },
-          "match": "(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?)(?:(?:(?:(=)|(\\+=))|(-=))?)(?:(?:(?<==| |\\t|^|\\{|\\(|\\[)(?:(?:(?:(?:(?:(0[xX][0-9A-Fa-f]+)|(0\\d+))|(\\d{1,2}#[0-9a-zA-Z@_]+))|(-?\\d+(?:\\.\\d+)))|(-?\\d+(?:\\.\\d+)+))|(-?\\d+))(?= |\\t|$|\\}|\\)|;))?))"
+          "match": "(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?)(?:(?:(?:(\\=)|(\\+\\=))|(\\-\\=))?)(?:(?:(?<==| |\\t|^|\\{|\\(|\\[)(?:(?:(?:(?:(?:(0[xX][0-9A-Fa-f]+)|(0\\d+))|(\\d{1,2}#[0-9a-zA-Z@_]+))|(-?\\d+(?:\\.\\d+)))|(-?\\d+(?:\\.\\d+)+))|(-?\\d+))(?= |\\t|$|\\}|\\)|;))?))"
         },
         {
           "include": "#normal_context"
@@ -1658,7 +1658,7 @@
       "name": "storage.modifier.$0.shell"
     },
     "normal_assignment_statement": {
-      "begin": "(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(=)|(\\+=))|(-=))",
+      "begin": "(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(\\=)|(\\+\\=))|(\\-\\=))",
       "beginCaptures": {
         "1": {
           "name": "variable.other.assignment.shell"
@@ -1976,7 +1976,7 @@
           "name": "string.unquoted.argument.shell"
         }
       },
-      "match": "(?:(>>?)(?:[ \\t]*+)([^ \\t\\n>&;<>()$`\\\\\"'<\\|]+))"
+      "match": "(?:(>>?)(?:[ \\t]*+)([^ \t\n>&;<>\\(\\)\\$`\\\\\"'<\\|]+))"
     },
     "redirect_number": {
       "captures": {
@@ -2021,7 +2021,7 @@
       ]
     },
     "regex_comparison": {
-      "match": "=~",
+      "match": "\\=~",
       "name": "keyword.operator.logical.regex.shell"
     },
     "regexp": {
@@ -2044,15 +2044,15 @@
                   "name": "string.unquoted.argument.shell constant.other.option.shell"
                 }
               },
-              "match": "(?:[ \\t]++)(-)(\\w+)"
+              "match": "(?:[ \\t]++)(\\-)(\\w+)"
             }
           ]
         }
       },
-      "match": "(?:(?:[ \\t]++)-(?:\\w+))*"
+      "match": "(?:(?:[ \\t]++)\\-(?:\\w+))*"
     },
     "simple_unquoted": {
-      "match": "[^ \\t\\n>&;<>()$`\\\\\"'<\\|]",
+      "match": "[^ \\t\\n>&;<>\\(\\)\\$`\\\\\"'<\\|]",
       "name": "string.unquoted.shell"
     },
     "special_expansion": {
@@ -2099,7 +2099,7 @@
           "name": "string.quoted.double.shell",
           "patterns": [
             {
-              "match": "\\\\[$\\n`\"\\\\]",
+              "match": "\\\\[\\$\\n`\"\\\\]",
               "name": "constant.character.escape.shell"
             },
             {
@@ -2130,7 +2130,7 @@
               "name": "constant.character.escape.ansi-c.shell"
             },
             {
-              "match": "\\\\\\d{3}\"",
+              "match": "\\\\[0-9]{3}\"",
               "name": "constant.character.escape.octal.shell"
             },
             {
@@ -2233,7 +2233,7 @@
               "name": "variable.parameter.positional.shell"
             }
           },
-          "match": "(?:(\\$)(\\d(?!\\w)))"
+          "match": "(?:(\\$)([0-9](?!\\w)))"
         },
         {
           "captures": {
@@ -2271,7 +2271,7 @@
               "include": "#array_access_inline"
             },
             {
-              "match": "\\d+",
+              "match": "[0-9]+",
               "name": "variable.parameter.positional.shell"
             },
             {

package/grammars/smalltalk.json

@@ -73,7 +73,7 @@
       "name": "keyword.operator.comparison.smalltalk"
     },
     {
-      "match": "(\\*|\\+|-|/|\\\\)",
+      "match": "(\\*|\\+|\\-|/|\\\\)",
       "name": "keyword.operator.arithmetic.smalltalk"
     },
     {
@@ -164,7 +164,7 @@
       "name": "meta.array.byte.smalltalk",
       "patterns": [
         {
-          "match": "\\d+(r[a-zA-Z0-9]+)?",
+          "match": "[0-9]+(r[a-zA-Z0-9]+)?",
           "name": "constant.numeric.integer.smalltalk"
         },
         {
@@ -213,19 +213,19 @@
     "numeric": {
       "patterns": [
         {
-          "match": "(?<!\\w)\\d+\\.\\d+s\\d*",
+          "match": "(?<!\\w)[0-9]+\\.[0-9]+s[0-9]*",
           "name": "constant.numeric.float.scaled.smalltalk"
         },
         {
-          "match": "(?<!\\w)\\d+\\.\\d+([edq]-?\\d+)?",
+          "match": "(?<!\\w)[0-9]+\\.[0-9]+([edq]-?[0-9]+)?",
           "name": "constant.numeric.float.smalltalk"
         },
         {
-          "match": "(?<!\\w)-?\\d+r[a-zA-Z0-9]+",
+          "match": "(?<!\\w)-?[0-9]+r[a-zA-Z0-9]+",
           "name": "constant.numeric.integer.radix.smalltalk"
         },
         {
-          "match": "(?<!\\w)-?\\d+([edq]-?\\d+)?",
+          "match": "(?<!\\w)-?[0-9]+([edq]-?[0-9]+)?",
           "name": "constant.numeric.integer.smalltalk"
         }
       ]

package/grammars/solidity.json

@@ -1016,7 +1016,7 @@
       "name": "constant.numeric.hexadecimal"
     },
     "number-scientific": {
-      "match": "\\b(?:0\\.(?:0\\d|\\d[0-9_]?)|\\d[0-9_]*(?:\\.\\d{1,2})?)(?:e[+-]?[0-9_]+)?",
+      "match": "\\b(?:0\\.(?:0[0-9]|[0-9][0-9_]?)|[0-9][0-9_]*(?:\\.\\d{1,2})?)(?:e[+-]?[0-9_]+)?",
       "name": "constant.numeric.scientific"
     },
     "operator": {
@@ -1039,11 +1039,11 @@
       ]
     },
     "operator-arithmetic": {
-      "match": "(\\+|-|\\/|\\*)",
+      "match": "(\\+|\\-|\\/|\\*)",
       "name": "keyword.operator.arithmetic"
     },
     "operator-assignment": {
-      "match": "(:?=)",
+      "match": "(\\:?=)",
       "name": "keyword.operator.assignment"
     },
     "operator-binary": {
@@ -1051,7 +1051,7 @@
       "name": "keyword.operator.binary"
     },
     "operator-logic": {
-      "match": "(==|!=|<(?!<)|<=|>(?!>)|>=|\\&\\&|\\|\\||:(?!=)|\\?|!)",
+      "match": "(==|\\!=|<(?!<)|<=|>(?!>)|>=|\\&\\&|\\|\\||\\:(?!=)|\\?|\\!)",
       "name": "keyword.operator.logic"
     },
     "operator-mapping": {
@@ -1185,7 +1185,7 @@
               "name": "variable.parameter.function"
             }
           },
-          "match": "\\b(_\\w+)\\b"
+          "match": "\\b(\\_\\w+)\\b"
         },
         {
           "captures": {

package/grammars/soy.json

@@ -401,7 +401,7 @@
     "param": {
       "patterns": [
         {
-          "begin": "{(param)\\s+(\\w+\\s*:)",
+          "begin": "{(param)\\s+(\\w+\\s*\\:)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.soy"

package/grammars/sparql.json

@@ -25,7 +25,7 @@
   ],
   "repository": {
     "expression-operators": {
-      "match": "(?:\\|\\||&&|=|!=|<|>|<=|>=|\\*|/|\\+|-|\\||\\^|\\?|!)",
+      "match": "(?:\\|\\||&&|=|!=|<|>|<=|>=|\\*|/|\\+|-|\\||\\^|\\?|\\!)",
       "name": "support.class.sparql"
     },
     "functions": {

package/grammars/splunk.json

@@ -33,7 +33,7 @@
     },
     {
       "comment": "Escape Characters",
-      "match": "(\\\\\\\\|\\\\\\||\\\\\\*|\\\\=)",
+      "match": "(\\\\\\\\|\\\\\\||\\\\\\*|\\\\\\=)",
       "name": "contant.character.escape.splunk_search"
     },
     {
@@ -48,12 +48,12 @@
     },
     {
       "comment": "Splunk Macro Parameters",
-      "match": "(?<=\\(|,|[^=]\\s{300})([^()\\\",=]+)(?=\\)|,)",
+      "match": "(?<=\\(|,|[^=]\\s{300})([^\\(\\)\\\",=]+)(?=\\)|,)",
       "name": "variable.parameter.splunk_search"
     },
     {
       "comment": "Splunk Variables",
-      "match": "([\\w\\.]+)(\\[\\]|\\{\\})?([\\s]*)(?==)",
+      "match": "([\\w\\.]+)(\\[\\]|\\{\\})?([\\s]*)(?=\\=)",
       "name": "variable.splunk_search"
     },
     {

package/grammars/sql.json

@@ -118,7 +118,7 @@
           "name": "storage.type.sql"
         }
       },
-      "match": "(?i)\\b(bigint|bigserial|bit|boolean|box|bytea|cidr|circle|date|double\\sprecision|inet|int|integer|line|lseg|macaddr|money|oid|path|point|polygon|real|serial|smallint|sysdate|text)\\b|\\b(bit\\svarying|character\\s(?:varying)?|tinyint|var\\schar|float|interval)\\((\\d+)\\)|\\b(char|number|varchar\\d?)\\b(?:\\((\\d+)\\))?|\\b(numeric|decimal)\\b(?:\\((\\d+),(\\d+)\\))?|\\b(times?)\\b(?:\\((\\d+)\\))?(\\swith(?:out)?\\stime\\szone\\b)?|\\b(timestamp)(?:(s|tz))?\\b(?:\\((\\d+)\\))?(\\s(with|without)\\stime\\szone\\b)?"
+      "match": "(?xi)\n\n\t\t\t\t# normal stuff, capture 1\n\t\t\t\t \\b(bigint|bigserial|bit|boolean|box|bytea|cidr|circle|date|double\\sprecision|inet|int|integer|line|lseg|macaddr|money|oid|path|point|polygon|real|serial|smallint|sysdate|text)\\b\n\n\t\t\t\t# numeric suffix, capture 2 + 3i\n\t\t\t\t|\\b(bit\\svarying|character\\s(?:varying)?|tinyint|var\\schar|float|interval)\\((\\d+)\\)\n\n\t\t\t\t# optional numeric suffix, capture 4 + 5i\n\t\t\t\t|\\b(char|number|varchar\\d?)\\b(?:\\((\\d+)\\))?\n\n\t\t\t\t# special case, capture 6 + 7i + 8i\n\t\t\t\t|\\b(numeric|decimal)\\b(?:\\((\\d+),(\\d+)\\))?\n\n\t\t\t\t# special case, captures 9, 10i, 11\n\t\t\t\t|\\b(times?)\\b(?:\\((\\d+)\\))?(\\swith(?:out)?\\stime\\szone\\b)?\n\n\t\t\t\t# special case, captures 12, 13, 14i, 15\n\t\t\t\t|\\b(timestamp)(?:(s|tz))?\\b(?:\\((\\d+)\\))?(\\s(with|without)\\stime\\szone\\b)?\n\n\t\t\t"
     },
     {
       "match": "(?i:\\b((?:primary|foreign)\\s+key|references|on\\sdelete(\\s+cascade)?|nocheck|check|constraint|collate|default)\\b)",
@@ -500,7 +500,7 @@
           "name": "punctuation.definition.string.end.sql"
         }
       },
-      "match": "(#\\{)([^}]*)(\\})",
+      "match": "(#\\{)([^\\}]*)(\\})",
       "name": "string.interpolated.sql"
     },
     "strings": {

package/grammars/ssh-config.json

@@ -68,11 +68,11 @@
       "match": "(?:^| |\\t)(Host)\\s+((.*))$"
     },
     {
-      "match": "\\b(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\b",
+      "match": "\\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b",
       "name": "constant.numeric.ssh-config"
     },
     {
-      "match": "\\b\\d+\\b",
+      "match": "\\b[0-9]+\\b",
       "name": "constant.numeric.ssh-config"
     },
     {

package/grammars/stata.json

@@ -176,7 +176,7 @@
           "name": "keyword.control.flow.stata"
         }
       },
-      "end": "\\s*(=)\\s*([^{]+)\\s*|(?=\\n)",
+      "end": "\\s*(=)\\s*([^\\{]+)\\s*|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.assignment.stata"
@@ -280,7 +280,7 @@
       "captures": {
         "1": "keyword.functions.data.stata.test"
       },
-      "match": "\\b(form(at|a)?)\\s*([\\w&&[^0-9]]\\w{0,31})*\\s*(%)(-)?(0)?(\\d+)(.)(\\d+)(e|f|g)(c)?"
+      "match": "\\b(form(at|a)?)\\s*([\\w&&[^0-9]]\\w{0,31})*\\s*(%)(-)?(0)?([0-9]+)(.)([0-9]+)(e|f|g)(c)?"
     },
     {
       "include": "#braces-with-error"
@@ -525,7 +525,7 @@
           "name": "keyword.operator.assignment.stata"
         }
       },
-      "match": "\\b(g(enerate|enerat|enera|ener|ene|en|e)?|egen)\\s+((byte|int|long|float|double|str[1-9]?\\d?\\d?\\d?|strL)\\s+)?([^=\\s]+)\\s*((==)|(=))"
+      "match": "\\b(g(enerate|enerat|enera|ener|ene|en|e)?|egen)\\s+((byte|int|long|float|double|str[1-9]?[0-9]?[0-9]?[0-9]?|strL)\\s+)?([^=\\s]+)\\s*((==)|(=))"
     },
     {
       "captures": {
@@ -536,7 +536,7 @@
           "name": "support.type.stata"
         }
       },
-      "match": "\\b(set ty(pe|p)?)\\s+((byte|int|long|float|double|str[1-9]?\\d?\\d?\\d?|strL)?\\s+)\\b"
+      "match": "\\b(set ty(pe|p)?)\\s+((byte|int|long|float|double|str[1-9]?[0-9]?[0-9]?[0-9]?|strL)?\\s+)\\b"
     },
     {
       "captures": {
@@ -567,7 +567,7 @@
               "include": "#macro-global"
             },
             {
-              "match": "[^`$]{81,}",
+              "match": "[^`\\$]{81,}",
               "name": "invalid.illegal.name.stata"
             },
             {
@@ -608,7 +608,7 @@
               "include": "#macro-global"
             },
             {
-              "match": "[^`$]{81,}",
+              "match": "[^`\\$]{81,}",
               "name": "invalid.illegal.name.stata"
             },
             {
@@ -704,7 +704,7 @@
           "name": "storage.type.orgtype.mata"
         },
         {
-          "match": "!|\\+\\+|--|\\&|\\'|\\?|\\\\|::|\\,|\\.\\.|\\||=|==|>=|<=|<|>|!=|\\#|\\+|-|\\*|\\^|\\/",
+          "match": "\\!|\\+\\+|\\-\\-|\\&|\\'|\\?|\\\\|\\:\\:|\\,|\\.\\.|\\||\\=|\\=\\=|\\>\\=|\\<\\=|\\<|\\>|\\!\\=|\\#|\\+|\\-|\\*|\\^|\\/",
           "name": "keyword.operator.mata"
         },
         {
@@ -761,7 +761,7 @@
     "ascii-regex-character-class": {
       "patterns": [
         {
-          "match": "\\\\[\\*+?\\-\\.\\^$\\|\\[\\]()\\\\]",
+          "match": "\\\\[\\*\\+\\?\\-\\.\\^\\$\\|\\[\\]\\(\\)\\\\]",
           "name": "constant.character.escape.backslash.stata"
         },
         {
@@ -802,7 +802,7 @@
                   "name": "constant.character.escape.backslash.stata"
                 }
               },
-              "match": "((\\\\.)|.)-((\\\\.)|[^\\]])",
+              "match": "((\\\\.)|.)\\-((\\\\.)|[^\\]])",
               "name": "constant.other.character-class.range.stata"
             }
           ]
@@ -1016,7 +1016,7 @@
             }
           },
           "comment": "color regexr with regular quotes i.e. \" ",
-          "match": "\\b(regexr)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*([^)]*)(\\))"
+          "match": "\\b(regexr)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*([^\\)]*)(\\))"
         },
         {
           "captures": {
@@ -1103,7 +1103,7 @@
             }
           },
           "comment": "color regexr with compound quotes i.e. `\"text\"' ",
-          "match": "\\b(regexr)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*([^)]*)(\\))"
+          "match": "\\b(regexr)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*([^\\)]*)(\\))"
         }
       ]
     },
@@ -1115,11 +1115,11 @@
         },
         {
           "comment": "matched when not a global, but must be ascii",
-          "match": "\\$(?![a-zA-Z_{])",
+          "match": "\\$(?![a-zA-Z_\\{])",
           "name": "keyword.control.anchor.stata"
         },
         {
-          "match": "[?+\\*]",
+          "match": "[\\?\\+\\*]",
           "name": "keyword.control.quantifier.stata"
         },
         {
@@ -1197,7 +1197,7 @@
             }
           },
           "comment": "correct with nothing else on the line but whitespace; before and after; before; after; correct",
-          "end": "^\\s*(\\})\\s*$|^\\s*([^\\*\"}]+)\\s+(\\})\\s*([^\\*\"}/\\n]+)|^\\s*([^\"\\*}]+)\\s+(\\})|\\s*(\\})\\s*([^\"\\*}/\\n]+)|(\\})$",
+          "end": "^\\s*(\\})\\s*$|^\\s*([^\\*\"\\}]+)\\s+(\\})\\s*([^\\*\"\\}/\\n]+)|^\\s*([^\"\\*\\}]+)\\s+(\\})|\\s*(\\})\\s*([^\"\\*\\}/\\n]+)|(\\})$",
           "endCaptures": {
             "1": {
               "name": "keyword.control.block.end.stata"
@@ -1256,7 +1256,7 @@
     "builtin_types": {
       "patterns": [
         {
-          "match": "\\b(byte|int|long|float|double|str[1-9]?\\d?\\d?\\d?|strL)\\b",
+          "match": "\\b(byte|int|long|float|double|str[1-9]?[0-9]?[0-9]?[0-9]?|strL)\\b",
           "name": "support.type.stata"
         }
       ]
@@ -1405,15 +1405,15 @@
           "include": "#factorvariables"
         },
         {
-          "match": "\\b(?i:(\\d+\\.\\d*(e[\\-+]?\\d+)?))(?=[^a-zA-Z_])",
+          "match": "\\b(?i:(\\d+\\.\\d*(e[\\-\\+]?\\d+)?))(?=[^a-zA-Z_])",
           "name": "constant.numeric.float.stata"
         },
         {
-          "match": "(?<=[^0-9a-zA-Z_])(?i:(\\.\\d+(e[\\-+]?\\d+)?))",
+          "match": "(?<=[^0-9a-zA-Z_])(?i:(\\.\\d+(e[\\-\\+]?\\d+)?))",
           "name": "constant.numeric.float.stata"
         },
         {
-          "match": "\\b(?i:(\\d+e[\\-+]?\\d+))",
+          "match": "\\b(?i:(\\d+e[\\-\\+]?\\d+))",
           "name": "constant.numeric.float.stata"
         },
         {
@@ -1707,7 +1707,7 @@
     "macro-commands": {
       "patterns": [
         {
-          "begin": "\\b(loc(al|a)?)\\s+([\\w'`$(){}]+)\\s*(?=:|=)",
+          "begin": "\\b(loc(al|a)?)\\s+([\\w'`\\$\\(\\)\\{\\}]+)\\s*(?=:|=)",
           "beginCaptures": {
             "1": {
               "name": "keyword.macro.stata"
@@ -1759,7 +1759,7 @@
           ]
         },
         {
-          "begin": "\\b(gl(obal|oba|ob|o)?)\\s+(?=[\\w`$])",
+          "begin": "\\b(gl(obal|oba|ob|o)?)\\s+(?=[\\w`\\$])",
           "beginCaptures": {
             "1": {
               "name": "keyword.macro.stata"
@@ -1783,7 +1783,7 @@
           ]
         },
         {
-          "begin": "\\b(loc(al|a)?)\\s+(\\+\\+|--)?(?=[\\w`$])",
+          "begin": "\\b(loc(al|a)?)\\s+(\\+\\+|\\-\\-)?(?=[\\w`\\$])",
           "beginCaptures": {
             "1": {
               "name": "keyword.macro.stata"
@@ -1923,7 +1923,7 @@
               "name": "entity.name.type.class.stata"
             }
           },
-          "match": "\\b(list)\\s+(\\w{1,32})\\s+(\\||&|-|===|==|in)\\s+(\\w{1,32})"
+          "match": "\\b(list)\\s+(\\w{1,32})\\s+(\\||&|\\-|===|==|in)\\s+(\\w{1,32})"
         },
         {
           "captures": {
@@ -2267,7 +2267,7 @@
           },
           "patterns": [
             {
-              "match": "\\+\\+|--",
+              "match": "\\+\\+|\\-\\-",
               "name": "keyword.operator.arithmetic.stata"
             },
             {
@@ -2326,7 +2326,7 @@
     "macro-local-identifiers": {
       "patterns": [
         {
-          "match": "[^\\w'`$()\\s]",
+          "match": "[^\\w'`\\$\\(\\)\\s]",
           "name": "invalid.illegal.name.stata"
         },
         {
@@ -2343,7 +2343,7 @@
       "patterns": [
         {
           "comment": "++ and -- must come first to support ligatures",
-          "match": "\\+\\+|--|\\+|-|\\*|\\^",
+          "match": "\\+\\+|\\-\\-|\\+|\\-|\\*|\\^",
           "name": "keyword.operator.arithmetic.stata"
         },
         {
@@ -2405,15 +2405,15 @@
     "reserved-names": {
       "patterns": [
         {
-          "match": "\\b(_all|_b|byte|_coef|_cons|double|float|if|in|int|long|_n|_N|_pi|_pred|_rc|_skip|str\\d+|strL|using|with)\\b",
+          "match": "\\b(_all|_b|byte|_coef|_cons|double|float|if|in|int|long|_n|_N|_pi|_pred|_rc|_skip|str[0-9]+|strL|using|with)\\b",
           "name": "invalid.illegal.name.stata"
         },
         {
-          "match": "[^\\w'`$()\\s]",
+          "match": "[^\\w'`\\$\\(\\)\\s]",
           "name": "invalid.illegal.name.stata"
         },
         {
-          "match": "\\d[\\w]{31,}",
+          "match": "[0-9][\\w]{31,}",
           "name": "invalid.illegal.name.stata"
         },
         {
@@ -2592,7 +2592,7 @@
                   "name": "constant.character.escape.backslash.stata"
                 }
               },
-              "match": "((\\\\.)|.)-((\\\\.)|[^\\]])",
+              "match": "((\\\\.)|.)\\-((\\\\.)|[^\\]])",
               "name": "constant.other.character-class.range.stata"
             }
           ]
@@ -2831,7 +2831,7 @@
             }
           },
           "comment": "color regexr with regular quotes i.e. \" ",
-          "match": "\\b(ustrregexrf|ustrregexra)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*([^)]*)(\\))"
+          "match": "\\b(ustrregexrf|ustrregexra)(\\()([^,]+)(,)\\s*(\")([^\"]+)(\"(')?)\\s*([^\\)]*)(\\))"
         },
         {
           "captures": {
@@ -2921,7 +2921,7 @@
             }
           },
           "comment": "color regexr with compound quotes i.e. `\"text\"' ",
-          "match": "\\b(ustrregexrf|ustrregexra)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*([^)]*)(\\))"
+          "match": "\\b(ustrregexrf|ustrregexra)(\\()([^,]+)(,)\\s*(`\")([^\"]+)(\"')\\s*([^\\)]*)(\\))"
         }
       ]
     },
@@ -2937,7 +2937,7 @@
           "name": "keyword.control.anchor.stata"
         },
         {
-          "match": "\\\\[1-9]\\d?",
+          "match": "\\\\[1-9][0-9]?",
           "name": "keyword.other.back-reference.stata"
         },
         {
@@ -3008,7 +3008,7 @@
           ]
         },
         {
-          "begin": "(\\()(\\?\\(([1-9]\\d?|[a-zA-Z_][a-zA-Z_0-9]*)\\))",
+          "begin": "(\\()(\\?\\(([1-9][0-9]?|[a-zA-Z_][a-zA-Z_0-9]*)\\))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.group.stata"