tm-grammars 1.22.18 → 1.23.0

package/grammars/gdresource.json

@@ -40,7 +40,7 @@
               "name": "punctuation.definition.table.inline.gdresource"
             }
           },
-          "end": "\\s*(\\})(?!\\w)",
+          "end": "\\s*(})(?!\\w)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.table.inline.gdresource"
@@ -62,7 +62,7 @@
               "name": "punctuation.definition.array.gdresource"
             }
           },
-          "end": "\\s*(\\])(?!\\w)",
+          "end": "\\s*(])(?!\\w)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.array.gdresource"
@@ -80,7 +80,7 @@
           "name": "string.quoted.triple.basic.block.gdresource",
           "patterns": [
             {
-              "match": "\\\\([btnfr\"\\\\\\n/ ]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\([btnfr\"\\\\\\n/ ]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape.gdresource"
             },
             {
@@ -90,7 +90,7 @@
           ]
         },
         {
-          "match": "\"res:\\/\\/[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"",
+          "match": "\"res://[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"",
           "name": "support.function.any-method.gdresource"
         },
         {
@@ -107,7 +107,7 @@
           "name": "string.quoted.double.basic.line.gdresource",
           "patterns": [
             {
-              "match": "\\\\([btnfr\"\\\\\\n/ ]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\([btnfr\"\\\\\\n/ ]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape.gdresource"
             },
             {
@@ -125,23 +125,23 @@
           "name": "constant.language.gdresource"
         },
         {
-          "match": "(?<!\\w)([\\+\\-]?(0|([1-9](([0-9]|_[0-9])+)?))(?:(?:\\.(0|([1-9](([0-9]|_[0-9])+)?)))?[eE][\\+\\-]?[1-9]_?[0-9]*|(?:\\.[0-9_]*)))(?!\\w)",
+          "match": "(?<!\\w)([+\\-]?(0|([1-9](([0-9]|_[0-9])+)?))(?:(?:\\.(0|([1-9](([0-9]|_[0-9])+)?)))?[eE][+\\-]?[1-9]_?[0-9]*|\\.[0-9_]*))(?!\\w)",
           "name": "constant.numeric.float.gdresource"
         },
         {
-          "match": "(?<!\\w)((?:[\\+\\-]?(0|([1-9](([0-9]|_[0-9])+)?))))(?!\\w)",
+          "match": "(?<!\\w)([+\\-]?(0|([1-9](([0-9]|_[0-9])+)?)))(?!\\w)",
           "name": "constant.numeric.integer.gdresource"
         },
         {
-          "match": "(?<!\\w)([\\+\\-]?inf)(?!\\w)",
+          "match": "(?<!\\w)([+\\-]?inf)(?!\\w)",
           "name": "constant.numeric.inf.gdresource"
         },
         {
-          "match": "(?<!\\w)([\\+\\-]?nan)(?!\\w)",
+          "match": "(?<!\\w)([+\\-]?nan)(?!\\w)",
           "name": "constant.numeric.nan.gdresource"
         },
         {
-          "match": "(?<!\\w)((?:0x(([0-9a-fA-F](([0-9a-fA-F]|_[0-9a-fA-F])+)?))))(?!\\w)",
+          "match": "(?<!\\w)(0x((\\h((\\h|_\\h)+)?)))(?!\\w)",
           "name": "constant.numeric.hex.gdresource"
         },
         {
@@ -224,7 +224,7 @@
           "name": "keyword.control.gdresource"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#heading_properties"
@@ -241,7 +241,7 @@
           "name": "invalid.illegal.noValue.gdresource"
         },
         {
-          "begin": "\\s*([A-Za-z_-][^\\s]*|\".+\"|'.+'|[0-9]+)\\s*(=)\\s*",
+          "begin": "\\s*([A-Za-z_\\-]\\S*|\".+\"|'.+'|[0-9]+)\\s*(=)\\s*",
           "beginCaptures": {
             "1": {
               "name": "variable.other.property.gdresource"
@@ -250,7 +250,7 @@
               "name": "punctuation.definition.keyValue.gdresource"
             }
           },
-          "end": "($|(?==)|\\,?|\\s*(?=\\}))",
+          "end": "($|(?==)|,?|\\s*(?=}))",
           "patterns": [
             {
               "include": "#data"
@@ -266,7 +266,7 @@
           "name": "invalid.illegal.noValue.gdresource"
         },
         {
-          "begin": "\\s*([A-Za-z_-][^\\s]*|\".+\"|'.+'|[0-9]+)\\s*(=)\\s*",
+          "begin": "\\s*([A-Za-z_\\-]\\S*|\".+\"|'.+'|[0-9]+)\\s*(=)\\s*",
           "beginCaptures": {
             "1": {
               "name": "variable.other.property.gdresource"
@@ -275,7 +275,7 @@
               "name": "punctuation.definition.keyValue.gdresource"
             }
           },
-          "end": "($|(?==)|\\,|\\s*(?=\\}))",
+          "end": "($|(?==)|,|\\s*(?=}))",
           "patterns": [
             {
               "include": "#data"

package/grammars/gdscript.json

@@ -54,7 +54,7 @@
       "match": "(@)(export|export_group|export_color_no_alpha|export_custom|export_dir|export_enum|export_exp_easing|export_file|export_flags|export_flags_2d_navigation|export_flags_2d_physics|export_flags_2d_render|export_flags_3d_navigation|export_flags_3d_physics|export_flags_3d_render|export_global_dir|export_global_file|export_multiline|export_node_path|export_placeholder|export_range|export_storage|icon|onready|rpc|tool|warning_ignore|static_unload)\\b"
     },
     "any_method": {
-      "match": "\\b([A-Za-z_]\\w*)\\b(?=\\s*(?:[(]))",
+      "match": "\\b([A-Za-z_]\\w*)\\b(?=\\s*\\()",
       "name": "entity.name.function.other.gdscript"
     },
     "any_property": {
@@ -69,14 +69,14 @@
           "name": "variable.other.property.gdscript"
         }
       },
-      "match": "\\b(\\.)\\s*(?<![@\\$#%])(?:([A-Z_][A-Z_0-9]*)|([A-Za-z_]\\w*))\\b(?![(])"
+      "match": "\\b(\\.)\\s*(?<![@$#%])(?:([A-Z_][A-Z_0-9]*)|([A-Za-z_]\\w*))\\b(?!\\()"
     },
     "any_variable": {
-      "match": "\\b(?<![@\\$#%])([A-Za-z_]\\w*)\\b(?![(])",
+      "match": "\\b(?<![@$#%])([A-Za-z_]\\w*)\\b(?!\\()",
       "name": "variable.other.gdscript"
     },
     "arithmetic_operator": {
-      "match": "->|\\+=|-=|\\*\\*=|\\*=|\\^=|/=|%=|&=|~=|\\|=|\\*\\*|\\*|/|%|\\+|-",
+      "match": "->|\\+=|-=|\\*\\*=|\\*=|\\^=|/=|%=|&=|~=|\\|=|\\*\\*|[*/%+\\-]",
       "name": "keyword.operator.arithmetic.gdscript"
     },
     "assignment_operator": {
@@ -181,7 +181,7 @@
       ]
     },
     "bitwise_operator": {
-      "match": "&|\\||<<=|>>=|<<|>>|\\^|~",
+      "match": "[\\&|]|<<=|>>=|<<|>>|[\\^~]",
       "name": "keyword.operator.bitwise.gdscript"
     },
     "boolean_operator": {
@@ -256,7 +256,7 @@
       ]
     },
     "builtin_get_node_shorthand_quoted": {
-      "begin": "(?:(\\$|%)|(&|\\^|@))(\"|')",
+      "begin": "(?:([$%])|([\\&\\^@]))([\"'])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.flow.gdscript"
@@ -338,11 +338,11 @@
           "name": "punctuation.definition.comment.number-sign.gdscript"
         }
       },
-      "match": "(##|#).*$\\n?",
+      "match": "(#(?:#|)).*$\\n?",
       "name": "comment.line.number-sign.gdscript"
     },
     "compare_operator": {
-      "match": "<=|>=|==|<|>|!=|!",
+      "match": "<=|>=|==|[<>]|!=|!",
       "name": "keyword.operator.comparison.gdscript"
     },
     "const_vars": {
@@ -360,7 +360,7 @@
           "name": "punctuation.definition.dict.begin.gdscript"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dict.end.gdscript"
@@ -688,7 +688,7 @@
               "name": "punctuation.separator.continuation.line.gdscript"
             }
           },
-          "end": "(?=^\\s*$)|(?!(\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))|(\\G$))",
+          "end": "(?=^\\s*$)|(?!(\\s*[rR]?('''|\"\"\"|['\"]))|(\\G$))",
           "patterns": [
             {
               "include": "#base_expression"
@@ -722,7 +722,7 @@
           "name": "keyword.control.gdscript"
         }
       },
-      "match": "^\n\\s*(match)"
+      "match": "^\\n\\s*(match)"
     },
     "nodepath_function": {
       "begin": "(get_node_or_null|has_node|has_node_and_resource|find_node|get_node)\\s*(\\()",
@@ -744,7 +744,7 @@
       "name": "meta.function.gdscript",
       "patterns": [
         {
-          "begin": "(\"|')",
+          "begin": "([\"'])",
           "end": "\\1",
           "name": "string.quoted.gdscript meta.literal.nodepath.gdscript constant.character.escape",
           "patterns": [
@@ -760,17 +760,17 @@
       ]
     },
     "nodepath_object": {
-      "begin": "(NodePath)\\s*(?:\\()",
+      "begin": "(NodePath)\\s*\\(",
       "beginCaptures": {
         "1": {
           "name": "support.class.library.gdscript"
         }
       },
-      "end": "(?:\\))",
+      "end": "\\)",
       "name": "meta.literal.nodepath.gdscript",
       "patterns": [
         {
-          "begin": "(\"|')",
+          "begin": "([\"'])",
           "end": "\\1",
           "name": "string.quoted.gdscript constant.character.escape.gdscript",
           "patterns": [
@@ -789,23 +789,27 @@
           "name": "constant.numeric.integer.binary.gdscript"
         },
         {
-          "match": "0x[0-9A-Fa-f_]+",
+          "match": "0x[_\\h]+",
           "name": "constant.numeric.integer.hexadecimal.gdscript"
         },
         {
-          "match": "\\.[0-9][0-9_]*([eE][+-]?[0-9_]+)?",
+          "match": "\\.[0-9][0-9_]*([eE][+\\-]?[0-9_]+)?",
+          "name": "constant.numeric.float.gdscript"
+        },
+        {
+          "match": "([0-9][0-9_]*)\\.[0-9_]*([eE][+\\-]?[0-9_]+)?",
           "name": "constant.numeric.float.gdscript"
         },
         {
-          "match": "([0-9][0-9_]*)?\\.[0-9_]*([eE][+-]?[0-9_]+)?",
+          "match": "([0-9][0-9_]*)?\\.[0-9_]*([eE][+\\-]?[0-9_]+)",
           "name": "constant.numeric.float.gdscript"
         },
         {
-          "match": "[0-9][0-9_]*[eE][+-]?[0-9_]+",
+          "match": "[0-9][0-9_]*[eE][+\\-]?[0-9_]+",
           "name": "constant.numeric.float.gdscript"
         },
         {
-          "match": "[-]?[0-9][0-9_]*",
+          "match": "-?[0-9][0-9_]*",
           "name": "constant.numeric.integer.gdscript"
         }
       ]
@@ -940,7 +944,7 @@
           "name": "punctuation.definition.list.begin.gdscript"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.list.end.gdscript"
@@ -978,7 +982,7 @@
               "name": "keyword.control.flow.gdscript"
             }
           },
-          "match": "^\\s*(case|match)(?=\\s*([-+\\w\\d(\\[{'\":#]|$))\\b"
+          "match": "^\\s*(case|match)(?=\\s*([\\-+\\w\\d(\\[{'\":#]|$))\\b"
         }
       ]
     },
@@ -996,7 +1000,7 @@
               "name": "storage.type.format.gdscript"
             }
           },
-          "match": "({{|}}|(?:{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?}))",
+          "match": "(\\{\\{|}}|\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:\\w?[<>=\\^]?[\\-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?})",
           "name": "meta.format.brace.gdscript"
         },
         {
@@ -1011,7 +1015,7 @@
               "name": "storage.type.format.gdscript"
             }
           },
-          "match": "({\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?\\}[^'\"{}\\n]*)*})",
+          "match": "(\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?}[^'\"{}\\n]*)*})",
           "name": "meta.format.brace.gdscript"
         }
       ]
@@ -1022,11 +1026,11 @@
           "name": "constant.character.format.placeholder.other.gdscript"
         }
       },
-      "match": "(%(\\([\\w\\s]*\\))?[-+#0 ]*(\\d+|\\*)?(\\.(\\d+|\\*))?([hlL])?[diouxXeEfFgGcrsab%])",
+      "match": "(%(\\([\\w\\s]*\\))?[\\-+#0 ]*(\\d+|\\*)?(\\.(\\d+|\\*))?([hlL])?[diouxXeEfFgGcrsab%])",
       "name": "meta.format.percent.gdscript"
     },
     "strings": {
-      "begin": "(r)?(\"\"\"|'''|\"|')",
+      "begin": "(r)?(\"\"\"|'''|[\"'])",
       "beginCaptures": {
         "1": {
           "name": "constant.character.escape.gdscript"
@@ -1101,7 +1105,7 @@
               "name": "entity.name.function.gdscript"
             }
           },
-          "match": "(setget)\\s+([a-zA-Z_]\\w*)(?:[,]\\s*([a-zA-Z_]\\w*))?"
+          "match": "(setget)\\s+([a-zA-Z_]\\w*)(?:,\\s*([a-zA-Z_]\\w*))?"
         },
         {
           "include": "#expression"

package/grammars/gdshader.json

@@ -45,7 +45,7 @@
           "name": "punctuation.bracket.gdshader"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "name": "meta.array-size.gdshader",
       "patterns": [
         {
@@ -110,7 +110,7 @@
       "name": "constant.language.float.gdshader"
     },
     "constructor": {
-      "match": "\\b[a-zA-Z_]\\w*(?=\\s*\\[\\s*\\w*\\s*\\]\\s*[(])|\\b[A-Z]\\w*(?=\\s*[(])",
+      "match": "\\b(?:[a-zA-Z_]\\w*(?=\\s*\\[\\s*\\w*\\s*]\\s*\\()|[A-Z]\\w*(?=\\s*\\())",
       "name": "entity.name.type.constructor.gdshader"
     },
     "controlKeyword": {
@@ -235,14 +235,14 @@
           "name": "entity.name.variable.field.gdshader"
         }
       },
-      "match": "([.])\\s*([a-zA-Z_]\\w*)\\b(?!\\s*\\()"
+      "match": "(\\.)\\s*([a-zA-Z_]\\w*)\\b(?!\\s*\\()"
     },
     "identifierFunction": {
-      "match": "\\b[a-zA-Z_]\\w*(?=(?:\\s|/\\*(?:\\*(?!/)|[^*])*\\*/)*[(])",
+      "match": "\\b[a-zA-Z_]\\w*(?=(?:\\s|/\\*(?:\\*(?!/)|[^*])*\\*/)*\\()",
       "name": "entity.name.function.gdshader"
     },
     "identifierType": {
-      "match": "\\b[a-zA-Z_]\\w*(?=(?:\\s*\\[\\s*\\w*\\s*\\])?\\s+[a-zA-Z_]\\w*\\b)",
+      "match": "\\b[a-zA-Z_]\\w*(?=(?:\\s*\\[\\s*\\w*\\s*])?\\s+[a-zA-Z_]\\w*\\b)",
       "name": "entity.name.type.gdshader"
     },
     "identifierVariable": {
@@ -275,7 +275,7 @@
       ]
     },
     "languageVariable": {
-      "match": "\\b(?:[A-Z][A-Z_0-9]*)\\b",
+      "match": "\\b[A-Z][A-Z_0-9]*\\b",
       "name": "variable.language.gdshader"
     },
     "literalBool": {
@@ -283,11 +283,11 @@
       "name": "constant.language.boolean.gdshader"
     },
     "literalFloat": {
-      "match": "\\b(?:\\d+[eE][-+]?\\d+|(?:\\d*[.]\\d+|\\d+[.])(?:[eE][-+]?\\d+)?)[fF]?",
+      "match": "\\b(?:\\d+[eE][\\-+]?\\d+|(?:\\d*\\.\\d+|\\d+\\.)(?:[eE][\\-+]?\\d+)?)[fF]?",
       "name": "constant.numeric.float.gdshader"
     },
     "literalInt": {
-      "match": "\\b(?:0[xX][0-9A-Fa-f]+|\\d+[uU]?)\\b",
+      "match": "\\b(?:0[xX]\\h+|\\d+[uU]?)\\b",
       "name": "constant.numeric.integer.gdshader"
     },
     "modifierKeyword": {
@@ -295,7 +295,7 @@
       "name": "storage.modifier.gdshader"
     },
     "operator": {
-      "match": "\\<\\<\\=?|\\>\\>\\=?|[-+*/&|<>=!]\\=|\\&\\&|[|][|]|[-+~!*/%<>&^|=]",
+      "match": "<<=?|>>=?|[\\-+*/\\&|<>=!]=|&&|\\|\\||[\\-+~!*/%<>\\&\\^|=]",
       "name": "keyword.operator.gdshader"
     },
     "precisionKeyword": {
@@ -303,34 +303,34 @@
       "name": "storage.type.built-in.primitive.precision.gdshader"
     },
     "processorFunction": {
-      "match": "\\b(?:vertex|fragment|light|start|process|sky|fog)(?=(?:\\s|/\\*(?:\\*(?!/)|[^*])*\\*/)*[(])",
+      "match": "\\b(?:vertex|fragment|light|start|process|sky|fog)(?=(?:\\s|/\\*(?:\\*(?!/)|[^*])*\\*/)*\\()",
       "name": "support.function.gdshader"
     },
     "separator": {
       "patterns": [
         {
-          "match": "[.]",
+          "match": "\\.",
           "name": "punctuation.accessor.gdshader"
         },
         {
           "include": "#separatorComma"
         },
         {
-          "match": "[;]",
+          "match": ";",
           "name": "punctuation.terminator.statement.gdshader"
         },
         {
-          "match": "[:]",
+          "match": ":",
           "name": "keyword.operator.type.annotation.gdshader"
         }
       ]
     },
     "separatorComma": {
-      "match": "[,]",
+      "match": ",",
       "name": "punctuation.separator.comma.gdshader"
     },
     "structDefinition": {
-      "begin": "(?=\\b(?:struct)\\b)",
+      "begin": "(?=\\bstruct\\b)",
       "end": "(?<=;)",
       "patterns": [
         {
@@ -357,7 +357,7 @@
           "name": "punctuation.definition.block.struct.gdshader"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.definition.block.struct.gdshader",
       "patterns": [
         {
@@ -378,7 +378,7 @@
       ]
     },
     "structKeyword": {
-      "match": "\\b(?:struct)\\b",
+      "match": "\\bstruct\\b",
       "name": "keyword.other.struct.gdshader"
     },
     "structName": {
@@ -394,7 +394,7 @@
           "name": "variable.other.property.gdshader"
         }
       },
-      "match": "([.])\\s*([xyzw]{2,4}|[rgba]{2,4}|[stpq]{2,4})\\b"
+      "match": "(\\.)\\s*([xyzw]{2,4}|[rgba]{2,4}|[stpq]{2,4})\\b"
     },
     "typeKeyword": {
       "match": "\\b(?:void|bool|[biu]?vec[234]|u?int|float|mat[234]|[iu]?sampler(?:3D|2D(?:Array)?)|samplerCube)\\b",

package/grammars/genie.json

@@ -82,7 +82,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
+          "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+\\-])?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
           "name": "constant.numeric.vala"
         },
         {
@@ -102,15 +102,15 @@
     "keywords": {
       "patterns": [
         {
-          "match": "(?<=^|[^@\\w\\.])(as|do|if|in|is|of|or|to|and|def|for|get|isa|new|not|out|ref|set|try|var|case|dict|else|enum|init|list|lock|null|pass|prop|self|true|uses|void|weak|when|array|async|break|class|const|event|false|final|owned|print|super|raise|while|yield|assert|delete|downto|except|extern|inline|params|public|raises|return|sealed|sizeof|static|struct|typeof|default|dynamic|ensures|finally|private|unowned|virtual|abstract|continue|delegate|internal|override|readonly|requires|volatile|construct|errordomain|interface|namespace|protected|implements)\\b",
+          "match": "(?<=^|[^@\\w.])(as|do|if|in|is|of|or|to|and|def|for|get|isa|new|not|out|ref|set|try|var|case|dict|else|enum|init|list|lock|null|pass|prop|self|true|uses|void|weak|when|array|async|break|class|const|event|false|final|owned|print|super|raise|while|yield|assert|delete|downto|except|extern|inline|params|public|raises|return|sealed|sizeof|static|struct|typeof|default|dynamic|ensures|finally|private|unowned|virtual|abstract|continue|delegate|internal|override|readonly|requires|volatile|construct|errordomain|interface|namespace|protected|implements)\\b",
           "name": "keyword.vala"
         },
         {
-          "match": "(?<=^|[^@\\w\\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b",
+          "match": "(?<=^|[^@\\w.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b",
           "name": "keyword.vala"
         },
         {
-          "match": "(#if|#elif|#else|#endif)",
+          "match": "(#(?:if|elif|else|endif))",
           "name": "keyword.vala"
         }
       ]
@@ -164,7 +164,7 @@
           ]
         },
         {
-          "match": "/((\\\\/)|([^/]))*/(?=\\s*[,;)\\.\\n])",
+          "match": "/((\\\\/)|([^/]))*/(?=\\s*[,;).\\n])",
           "name": "string.regexp.vala"
         }
       ]
@@ -172,7 +172,7 @@
     "types": {
       "patterns": [
         {
-          "match": "(?<=^|[^@\\w\\.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b",
+          "match": "(?<=^|[^@\\w.])(bool|double|float|unichar|char|uchar|int|uint|long|ulong|short|ushort|size_t|ssize_t|string|void|signal|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b",
           "name": "storage.type.primitive.vala"
         },
         {

package/grammars/gherkin.json

@@ -71,7 +71,7 @@
       "match": "^\\s*(기능|機能|功能|フィーチャ|خاصية|תכונה|Функціонал|Функционалност|Функционал|Особина|Функция|Функциональность|Свойство|Могућност|Özellik|Właściwość|Tính năng|Savybė|Požiadavka|Požadavek|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Fīča|Funzionalità|Funktionalität|Funkcionalnost|Funkcionalitāte|Funcționalitate|Functionaliteit|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Ability|Business Need|Feature|Ability|Egenskap|Egenskab|Crikey|Característica|Arwedd):(.*)\\b"
     },
     "scenario_outline_variable": {
-      "match": "<[a-zA-Z0-9 _-]*>",
+      "match": "<[a-zA-Z0-9 _\\-]*>",
       "name": "variable.other"
     },
     "step_keyword": {

package/grammars/git-commit.json

@@ -3,7 +3,7 @@
   "name": "git-commit",
   "patterns": [
     {
-      "begin": "(?=^diff\\ \\-\\-git)",
+      "begin": "(?=^diff --git)",
       "contentName": "source.diff",
       "end": "\\z",
       "name": "meta.embedded.diff.git-commit",

package/grammars/git-rebase.json

@@ -48,7 +48,7 @@
           "name": "support.function.git-rebase"
         }
       },
-      "match": "^\\s*(break|b)\\s*$",
+      "match": "^\\s*(b(?:reak|))\\s*$",
       "name": "meta.commit-command.git-rebase"
     }
   ],

package/grammars/gleam.json

@@ -54,7 +54,7 @@
           "include": "#boolean"
         },
         {
-          "match": "[[:upper:]][[:alnum:]]*",
+          "match": "\\p{upper}\\p{alnum}*",
           "name": "entity.name.type.gleam"
         }
       ]
@@ -66,13 +66,13 @@
       ]
     },
     "discards": {
-      "match": "\\b_(?:[[:word:]]+)?\\b",
+      "match": "\\b_\\p{word}+{0,1}\\b",
       "name": "comment.unused.gleam"
     },
     "entity": {
       "patterns": [
         {
-          "begin": "\\b([[:lower:]][[:word:]]*)\\b[[:space:]]*\\(",
+          "begin": "\\b(\\p{lower}\\p{word}*)\\b\\s*\\(",
           "captures": {
             "1": {
               "name": "entity.name.function.gleam"
@@ -86,11 +86,11 @@
           ]
         },
         {
-          "match": "\\b([[:lower:]][[:word:]]*):\\s",
+          "match": "\\b(\\p{lower}\\p{word}*):\\s",
           "name": "variable.parameter.gleam"
         },
         {
-          "match": "\\b([[:lower:]][[:word:]]*):",
+          "match": "\\b(\\p{lower}\\p{word}*):",
           "name": "entity.name.namespace.gleam"
         }
       ]
@@ -104,11 +104,11 @@
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(as|use|case|if|fn|import|let|assert|pub|type|opaque|const|todo|panic|else|try)\\b",
+          "match": "\\b(as|use|case|if|fn|import|let|assert|pub|type|opaque|const|todo|panic|else|try|echo)\\b",
           "name": "keyword.control.gleam"
         },
         {
-          "match": "(<\\-|\\->)",
+          "match": "(<-|->)",
           "name": "keyword.operator.arrow.gleam"
         },
         {
@@ -124,11 +124,11 @@
           "name": "keyword.operator.comparison.gleam"
         },
         {
-          "match": "(<=\\.|>=\\.|<\\.|>\\.)",
+          "match": "([<>](?:=\\.|\\.))",
           "name": "keyword.operator.comparison.float.gleam"
         },
         {
-          "match": "(<=|>=|<|>)",
+          "match": "(<=|>=|[<>])",
           "name": "keyword.operator.comparison.int.gleam"
         },
         {
@@ -144,11 +144,11 @@
           "name": "keyword.operator.other.gleam"
         },
         {
-          "match": "(\\+\\.|\\-\\.|/\\.|\\*\\.)",
+          "match": "(\\+\\.|-\\.|/\\.|\\*\\.)",
           "name": "keyword.operator.arithmetic.float.gleam"
         },
         {
-          "match": "(\\+|\\-|/|\\*|%)",
+          "match": "([+\\-/*%])",
           "name": "keyword.operator.arithmetic.int.gleam"
         },
         {