tm-grammars 1.22.19 → 1.23.0

package/grammars/log.json

@@ -10,59 +10,59 @@
       "name": "comment log.verbose"
     },
     {
-      "match": "(?i)\\[(verbose|verb|vrb|vb|v)\\]",
+      "match": "(?i)\\[(v(?:erbose|erb|rb|b|))]",
       "name": "comment log.verbose"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]*)\\bV\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bV\\b",
       "name": "comment log.verbose"
     },
     {
-      "match": "\\b(DEBUG|Debug)\\b|(?i)\\b(debug)\\:",
+      "match": "\\b(D(?:EBUG|ebug))\\b|(?i)\\b(debug):",
       "name": "markup.changed log.debug"
     },
     {
-      "match": "(?i)\\[(debug|dbug|dbg|de|d)\\]",
+      "match": "(?i)\\[(d(?:ebug|bug|bg|e|))]",
       "name": "markup.changed log.debug"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]*)\\bD\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bD\\b",
       "name": "markup.changed log.debug"
     },
     {
-      "match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE|II)\\b|(?i)\\b(info|information)\\:",
+      "match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE|II)\\b|(?i)\\b(info(?:|rmation)):",
       "name": "markup.inserted log.info"
     },
     {
-      "match": "(?i)\\[(information|info|inf|in|i)\\]",
+      "match": "(?i)\\[(i(?:nformation|nfo|nf|n|))]",
       "name": "markup.inserted log.info"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]*)\\bI\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bI\\b",
       "name": "markup.inserted log.info"
     },
     {
-      "match": "\\b(WARNING|WARN|Warn|WW)\\b|(?i)\\b(warning)\\:",
+      "match": "\\b(W(?:ARNING|ARN|arn|W))\\b|(?i)\\b(warning):",
       "name": "markup.deleted log.warning"
     },
     {
-      "match": "(?i)\\[(warning|warn|wrn|wn|w)\\]",
+      "match": "(?i)\\[(w(?:arning|arn|rn|n|))]",
       "name": "markup.deleted log.warning"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]*)\\bW\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bW\\b",
       "name": "markup.deleted log.warning"
     },
     {
-      "match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|FATAL|Error|EE)\\b|(?i)\\b(error)\\:",
+      "match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|FATAL|Error|EE)\\b|(?i)\\b(error):",
       "name": "string.regexp, strong log.error"
     },
     {
-      "match": "(?i)\\[(error|eror|err|er|e|fatal|fatl|ftl|fa|f)\\]",
+      "match": "(?i)\\[(error|eror|err|er|e|fatal|fatl|ftl|fa|f)]",
       "name": "string.regexp, strong log.error"
     },
     {
-      "match": "(?<=^[\\s\\d\\p]*)\\bE\\b",
+      "match": "(?<=^[\\s\\dp]*)\\bE\\b",
       "name": "string.regexp, strong log.error"
     },
     {
@@ -74,23 +74,23 @@
       "name": "comment log.date"
     },
     {
-      "match": "T?\\d{1,2}:\\d{2}(:\\d{2}([.,]\\d{1,})?)?(Z| ?[+-]\\d{1,2}:\\d{2})?\\b",
+      "match": "T?\\d{1,2}:\\d{2}(:\\d{2}([.,]\\d+)?)?(Z| ?[+\\-]\\d{1,2}:\\d{2})?\\b",
       "name": "comment log.date"
     },
     {
-      "match": "T\\d{2}\\d{2}(\\d{2}([.,]\\d{1,})?)?(Z| ?[+-]\\d{1,2}\\d{2})?\\b",
+      "match": "T\\d{2}\\d{2}(\\d{2}([.,]\\d+)?)?(Z| ?[+\\-]\\d{1,2}\\d{2})?\\b",
       "name": "comment log.date"
     },
     {
-      "match": "\\b([0-9a-fA-F]{40}|[0-9a-fA-F]{10}|[0-9a-fA-F]{7})\\b",
+      "match": "\\b(\\h{40}|\\h{10}|\\h{7})\\b",
       "name": "constant.language"
     },
     {
-      "match": "\\b[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}\\b",
+      "match": "\\b\\h{8}-?(\\h{4}-?){3}\\h{12}\\b",
       "name": "constant.language log.constant"
     },
     {
-      "match": "\\b([0-9a-fA-F]{2,}[:-])+[0-9a-fA-F]{2,}+\\b",
+      "match": "\\b(\\h{2,}[:\\-])+\\h{2,}{1,}\\b",
       "name": "constant.language log.constant"
     },
     {
@@ -98,7 +98,7 @@
       "name": "constant.language log.constant"
     },
     {
-      "match": "\\b(0x[a-fA-F0-9]+)\\b",
+      "match": "\\b(0x\\h+)\\b",
       "name": "constant.language log.constant"
     },
     {
@@ -106,7 +106,7 @@
       "name": "string log.string"
     },
     {
-      "match": "(?<![\\w])'[^']*'",
+      "match": "(?<!\\w)'[^']*'",
       "name": "string log.string"
     },
     {
@@ -123,7 +123,7 @@
       "name": "constant.language log.constant"
     },
     {
-      "match": "(?<![\\w/\\\\])([\\w-]+\\.)+([\\w-])+(?![\\w/\\\\])",
+      "match": "(?<![\\w/\\\\])([\\w\\-]+\\.)+([\\w\\-])+(?![\\w/\\\\])",
       "name": "constant.language log.constant"
     }
   ],

package/grammars/logo.json

@@ -22,11 +22,11 @@
           "name": "punctuation.definition.variable.logo"
         }
       },
-      "match": "(\\:)(?:\\|[^|]*\\||[-\\w.]*)+",
+      "match": "(:)(?:\\|[^|]*\\||[\\-\\w.]*)+",
       "name": "variable.parameter.logo"
     },
     {
-      "match": "\"(?:\\|[^|]*\\||[-\\w.]*)+",
+      "match": "\"(?:\\|[^|]*\\||[\\-\\w.]*)+",
       "name": "string.other.word.logo"
     },
     {

package/grammars/lua.json

@@ -12,7 +12,7 @@
           "name": "keyword.control.lua"
         }
       },
-      "end": "(?<=[\\)\\-{}\\[\\]\"'])",
+      "end": "(?<=[)\\-{}\\[\\]\"'])",
       "name": "meta.function.lua",
       "patterns": [
         {
@@ -25,7 +25,7 @@
               "name": "punctuation.definition.parameters.begin.lua"
             }
           },
-          "end": "(\\))|(?=[\\-\\.{}\\[\\]\"'])",
+          "end": "(\\))|(?=[\\-.{}\\[\\]\"'])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.parameters.finish.lua"
@@ -51,7 +51,7 @@
                   "name": "punctuation.separator.arguments.lua"
                 }
               },
-              "end": "(?=[\\),])",
+              "end": "(?=[),])",
               "patterns": [
                 {
                   "include": "#emmydoc.type"
@@ -71,15 +71,15 @@
       ]
     },
     {
-      "match": "(?<![\\w\\d.])0[xX][0-9A-Fa-f]+(\\.[0-9A-Fa-f]*)?([eE]-?\\d*)?([pP][-+]\\d+)?",
+      "match": "(?<![\\w\\d.])0[xX]\\h+(\\.\\h*)?([eE]-?\\d*)?([pP][\\-+]\\d+)?",
       "name": "constant.numeric.float.hexadecimal.lua"
     },
     {
-      "match": "(?<![\\w\\d.])0[xX]\\.[0-9A-Fa-f]+([eE]-?\\d*)?([pP][-+]\\d+)?",
+      "match": "(?<![\\w\\d.])0[xX]\\.\\h+([eE]-?\\d*)?([pP][\\-+]\\d+)?",
       "name": "constant.numeric.float.hexadecimal.lua"
     },
     {
-      "match": "(?<![\\w\\d.])0[xX][0-9A-Fa-f]+(?![pPeE.0-9])",
+      "match": "(?<![\\w\\d.])0[xX]\\h+(?![pPeE.0-9])",
       "name": "constant.numeric.integer.hexadecimal.lua"
     },
     {
@@ -138,10 +138,10 @@
           "name": "storage.type.attribute.lua"
         }
       },
-      "match": "<\\s*(const|close)\\s*>"
+      "match": "<\\s*(c(?:onst|lose))\\s*>"
     },
     {
-      "match": "\\<[a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*\\>",
+      "match": "<[a-zA-Z_*][a-zA-Z0-9_.*\\-]*>",
       "name": "storage.type.generic.lua"
     },
     {
@@ -157,7 +157,7 @@
       "name": "keyword.control.lua"
     },
     {
-      "match": "(?<![^.]\\.|:)\\b(false|nil(?!:)|true|_ENV|_G|_VERSION|math\\.(pi|huge|maxinteger|mininteger)|utf8\\.charpattern|io\\.(stdin|stdout|stderr)|package\\.(config|cpath|loaded|loaders|path|preload|searchers))\\b|(?<![.])\\.{3}(?!\\.)",
+      "match": "(?<![^.]\\.|:)\\b(false|nil(?!:)|true|_ENV|_G|_VERSION|math\\.(pi|huge|maxinteger|mininteger)|utf8\\.charpattern|io\\.(std(?:in|out|err))|package\\.(config|cpath|loaded|loaders|path|preload|searchers))\\b|(?<!\\.)\\.{3}(?!\\.)",
       "name": "constant.language.lua"
     },
     {
@@ -177,7 +177,7 @@
       "name": "support.function.library.lua"
     },
     {
-      "match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b",
+      "match": "\\b(and|or|not|\\|\\||&&|!)\\b",
       "name": "keyword.operator.lua"
     },
     {
@@ -201,7 +201,7 @@
       "name": "entity.name.function.lua"
     },
     {
-      "match": "\\+|-|%|#|\\*|\\/|\\^|==?|~=|!=|<=?|>=?|(?<!\\.)\\.{2}(?!\\.)",
+      "match": "[+\\-%#*/\\^]|==?|~=|!=|<=?|>=?|(?<!\\.)\\.{2}(?!\\.)",
       "name": "keyword.operator.lua"
     }
   ],
@@ -229,7 +229,7 @@
                   "name": "punctuation.definition.comment.begin.lua"
                 }
               },
-              "end": "(--)?\\]\\1\\]",
+              "end": "(--)?]\\1]",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.end.lua"
@@ -249,7 +249,7 @@
                   "name": "punctuation.definition.comment.begin.lua"
                 }
               },
-              "end": "(--)?\\]\\1\\]",
+              "end": "(--)?]\\1]",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.end.lua"
@@ -311,13 +311,13 @@
           ]
         },
         {
-          "begin": "\\/\\*",
+          "begin": "/\\*",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.lua"
             }
           },
-          "end": "\\*\\/",
+          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.lua"
@@ -347,11 +347,11 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "match": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "match": "\\b([a-zA-Z_*][a-zA-Z0-9_.*\\-]*)",
               "name": "support.class.lua"
             },
             {
-              "match": ":|,",
+              "match": "[:,]",
               "name": "keyword.operator.lua"
             }
           ]
@@ -366,7 +366,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "begin": "\\b([a-zA-Z_*][a-zA-Z0-9_.*\\-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.lua"
@@ -400,7 +400,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "begin": "\\b([a-zA-Z_*][a-zA-Z0-9_.*\\-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.lua"
@@ -442,7 +442,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "begin": "\\b([a-zA-Z_*][a-zA-Z0-9_.*\\-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.other.lua"
@@ -535,7 +535,7 @@
                   "include": "#emmydoc.type"
                 },
                 {
-                  "match": "\\]",
+                  "match": "]",
                   "name": "keyword.operator.lua"
                 }
               ]
@@ -663,7 +663,7 @@
               "name": "support.class.lua"
             },
             {
-              "match": ",|\\>|\\<",
+              "match": "[,><]",
               "name": "keyword.operator.lua"
             }
           ]
@@ -678,7 +678,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "match": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
+              "match": "\\b([a-zA-Z_*][a-zA-Z0-9_.*\\-]*)",
               "name": "support.class.lua"
             },
             {
@@ -709,7 +709,7 @@
               "end": "(?=\\n)",
               "patterns": [
                 {
-                  "match": "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\-]*)",
+                  "match": "\\b([a-zA-Z_*][a-zA-Z0-9_\\-]*)",
                   "name": "support.class.lua"
                 },
                 {
@@ -739,7 +739,7 @@
           "name": "storage.type.annotation.lua"
         },
         {
-          "begin": "(?<=---)\\|\\s*[\\>\\+]?",
+          "begin": "(?<=---)\\|\\s*[>+]?",
           "beginCaptures": {
             "0": {
               "name": "storage.type.annotation.lua"
@@ -766,11 +766,11 @@
           "end": "(?=[\\s#])",
           "patterns": [
             {
-              "match": "[\\(\\),:\\?][ \\t]*",
+              "match": "[(),:?][ \\t]*",
               "name": "keyword.operator.lua"
             },
             {
-              "match": "([a-zA-Z_][a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]*)(?<!,)[ \\t]*(?=\\??:)",
+              "match": "([a-zA-Z_][a-zA-Z0-9_.*\\[\\]<>,\\-]*)(?<!,)[ \\t]*(?=\\??:)",
               "name": "entity.name.variable.lua"
             },
             {
@@ -782,7 +782,7 @@
           ]
         },
         {
-          "match": "\\<[a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*\\>",
+          "match": "<[a-zA-Z_*][a-zA-Z0-9_.*\\-]*>",
           "name": "storage.type.generic.lua"
         },
         {
@@ -790,15 +790,15 @@
           "name": "entity.name.tag.lua"
         },
         {
-          "match": "[\\{\\}\\:\\,\\?\\|\\`][ \\t]*",
+          "match": "[{}:,?|`][ \\t]*",
           "name": "keyword.operator.lua"
         },
         {
-          "begin": "(?=[a-zA-Z_\\.\\*\"'\\[])",
-          "end": "(?=[\\s\\)\\,\\?\\:\\}\\|#])",
+          "begin": "(?=[a-zA-Z_.*\"'\\[])",
+          "end": "(?=[\\s),?:}|#])",
           "patterns": [
             {
-              "match": "([a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]+)(?<!,)[ \\t]*",
+              "match": "([a-zA-Z0-9_.*\\[\\]<>,\\-]+)(?<!,)[ \\t]*",
               "name": "support.type.lua"
             },
             {
@@ -827,11 +827,11 @@
           "name": "constant.character.escape.byte.lua"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f][0-9A-Fa-f]",
+          "match": "\\\\x\\h\\h",
           "name": "constant.character.escape.byte.lua"
         },
         {
-          "match": "\\\\u\\{[0-9A-Fa-f]+\\}",
+          "match": "\\\\u\\{\\h+}",
           "name": "constant.character.escape.unicode.lua"
         },
         {

package/grammars/luau.json

@@ -141,7 +141,7 @@
               "name": "variable.parameter.luau"
             }
           },
-          "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s)+(\\b\\w+\\b)"
+          "match": "((?<=[\\s*!/])[\\\\@]param)\\s+(\\b\\w+\\b)"
         }
       ]
     },
@@ -192,7 +192,7 @@
           "name": "keyword.control.luau"
         }
       },
-      "end": "(?<=[\\)\\-{}\\[\\]\"'])",
+      "end": "(?<=[)\\-{}\\[\\]\"'])",
       "name": "meta.function.luau",
       "patterns": [
         {
@@ -238,7 +238,7 @@
                   "name": "keyword.operator.type.luau"
                 }
               },
-              "end": "(?=[\\),])",
+              "end": "(?=[),])",
               "patterns": [
                 {
                   "include": "#type_literal"
@@ -248,7 +248,7 @@
           ]
         },
         {
-          "match": "\\b(__add|__call|__concat|__div|__eq|__index|__le|__len|__lt|__metatable|__mod|__mode|__mul|__newindex|__pow|__sub|__tostring|__unm|__iter|__idiv)\\b",
+          "match": "\\b(__(?:add|call|concat|div|eq|index|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tostring|unm|iter|idiv))\\b",
           "name": "variable.language.metamethod.luau"
         },
         {
@@ -302,7 +302,7 @@
         }
       },
       "contentName": "meta.embedded.line.luau",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.interpolated-string-expression.end.luau"
@@ -338,11 +338,11 @@
           "name": "keyword.operator.logical.luau keyword.operator.wordlike.luau"
         },
         {
-          "match": "(?<=[^.]\\.|:)\\b(__add|__call|__concat|__div|__eq|__index|__le|__len|__lt|__metatable|__mod|__mode|__mul|__newindex|__pow|__sub|__tostring|__unm)\\b",
+          "match": "(?<=[^.]\\.|:)\\b(__(?:add|call|concat|div|eq|index|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tostring|unm))\\b",
           "name": "variable.language.metamethod.luau"
         },
         {
-          "match": "(?<![.])\\.{3}(?!\\.)",
+          "match": "(?<!\\.)\\.{3}(?!\\.)",
           "name": "keyword.other.unit.luau"
         }
       ]
@@ -405,15 +405,15 @@
     "number": {
       "patterns": [
         {
-          "match": "\\b0_*[xX]_*[\\da-fA-F_]*(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "\\b0_*[xX]_*[\\da-fA-F_]*(?:[eE][+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.hex.luau"
         },
         {
-          "match": "\\b0_*[bB][01_]+(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "\\b0_*[bB][01_]+(?:[eE][+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.binary.luau"
         },
         {
-          "match": "(?:\\d[\\d_]*(?:\\.[\\d_]*)?|\\.\\d[\\d_]*)(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "(?:\\d[\\d_]*(?:\\.[\\d_]*)?|\\.\\d[\\d_]*)(?:[eE][+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.decimal.luau"
         }
       ]
@@ -429,7 +429,7 @@
           "name": "keyword.operator.assignment.luau"
         },
         {
-          "match": "\\+|-|%|\\*|\\/\\/|\\/|\\^",
+          "match": "[+\\-%*]|//|[/\\^]",
           "name": "keyword.operator.arithmetic.luau"
         },
         {
@@ -477,7 +477,7 @@
           "name": "support.function.luau"
         },
         {
-          "match": "(?<![^.]\\.|:)\\b(_G|_VERSION)\\b",
+          "match": "(?<![^.]\\.|:)\\b(_(?:G|VERSION))\\b",
           "name": "constant.language.luau"
         },
         {
@@ -551,11 +551,11 @@
           "name": "constant.character.escape.luau"
         },
         {
-          "match": "\\\\x[0-9a-fA-F]{2}",
+          "match": "\\\\x\\h{2}",
           "name": "constant.character.escape.luau"
         },
         {
-          "match": "\\\\u\\{[0-9a-fA-F]*\\}",
+          "match": "\\\\u\\{\\h*}",
           "name": "constant.character.escape.luau"
         },
         {
@@ -571,7 +571,7 @@
           "name": "punctuation.table.begin.luau"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "punctuation.table.end.luau"
@@ -610,7 +610,7 @@
     },
     "type_annotation": {
       "begin": ":(?!\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[)))",
-      "end": "(?<=\\))(?!\\s*->)|=|;|$|(?=\\breturn\\b)|(?=\\bend\\b)",
+      "end": "(?<=\\))(?!\\s*->)|[=;]|$|(?=\\breturn\\b)|(?=\\bend\\b)",
       "patterns": [
         {
           "include": "#comment"
@@ -627,7 +627,7 @@
           "name": "keyword.operator.typecast.luau"
         }
       },
-      "end": "(?=^|[;),}\\]:?\\-\\+\\>](?!\\s*[&\\|])|$|\\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|in|continue)\\b)",
+      "end": "(?=^|[;),}\\]:?\\-+>](?!\\s*[\\&|])|$|\\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|in|continue)\\b)",
       "patterns": [
         {
           "include": "#type_literal"
@@ -643,7 +643,7 @@
           "include": "#string"
         },
         {
-          "match": "\\?|\\&|\\|",
+          "match": "[?\\&|]",
           "name": "keyword.operator.type.luau"
         },
         {
@@ -713,11 +713,11 @@
         },
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "begin": "\\[",
-              "end": "\\]",
+              "end": "]",
               "patterns": [
                 {
                   "include": "#type_literal"