tm-grammars 1.22.19 → 1.23.0

package/grammars/wasm.json

@@ -63,7 +63,7 @@
                   "name": "support.type.wat"
                 }
               },
-              "match": "\\b(i8x16)(?:\\s+0x[0-9a-fA-F]{1,2}){16}\\b",
+              "match": "\\b(i8x16)(?:\\s+0x\\h{1,2}){16}\\b",
               "name": "constant.numeric.vector.wat"
             },
             {
@@ -72,7 +72,7 @@
                   "name": "support.type.wat"
                 }
               },
-              "match": "\\b(i16x8)(?:\\s+0x[0-9a-fA-F]{1,4}){8}\\b",
+              "match": "\\b(i16x8)(?:\\s+0x\\h{1,4}){8}\\b",
               "name": "constant.numeric.vector.wat"
             },
             {
@@ -81,7 +81,7 @@
                   "name": "support.type.wat"
                 }
               },
-              "match": "\\b(i32x4)(?:\\s+0x[0-9a-fA-F]{1,8}){4}\\b",
+              "match": "\\b(i32x4)(?:\\s+0x\\h{1,8}){4}\\b",
               "name": "constant.numeric.vector.wat"
             },
             {
@@ -90,7 +90,7 @@
                   "name": "support.type.wat"
                 }
               },
-              "match": "\\b(i64x2)(?:\\s+0x[0-9a-fA-F]{1,16}){2}\\b",
+              "match": "\\b(i64x2)(?:\\s+0x\\h{1,16}){2}\\b",
               "name": "constant.numeric.vector.wat"
             }
           ]
@@ -98,23 +98,23 @@
         {
           "patterns": [
             {
-              "match": "[+-]?\\b[0-9][0-9]*(?:\\.[0-9][0-9]*)?(?:[eE][+-]?[0-9]+)?\\b",
+              "match": "[+\\-]?\\b[0-9][0-9]*(?:\\.[0-9][0-9]*)?(?:[eE][+\\-]?[0-9]+)?\\b",
               "name": "constant.numeric.float.wat"
             },
             {
-              "match": "[+-]?\\b0x([0-9a-fA-F]*\\.[0-9a-fA-F]+|[0-9a-fA-F]+\\.?)[Pp][+-]?[0-9]+\\b",
+              "match": "[+\\-]?\\b0x(\\h*\\.\\h+|\\h+\\.?)[Pp][+\\-]?[0-9]+\\b",
               "name": "constant.numeric.float.wat"
             },
             {
-              "match": "[+-]?\\binf\\b",
+              "match": "[+\\-]?\\binf\\b",
               "name": "constant.numeric.float.wat"
             },
             {
-              "match": "[+-]?\\bnan:0x[0-9a-fA-F][0-9a-fA-F]*\\b",
+              "match": "[+\\-]?\\bnan:0x\\h\\h*\\b",
               "name": "constant.numeric.float.wat"
             },
             {
-              "match": "[+-]?\\b(?:0x[0-9a-fA-F][0-9a-fA-F]*|\\d[\\d]*)\\b",
+              "match": "[+\\-]?\\b(?:0x\\h\\h*|\\d\\d*)\\b",
               "name": "constant.numeric.integer.wat"
             }
           ]
@@ -131,7 +131,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "match": "\\b(i32|i64)\\.trunc_sat_f(?:32|64)_[su]\\b",
+              "match": "\\b(i(?:32|64))\\.trunc_sat_f(?:32|64)_[su]\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
@@ -144,7 +144,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "match": "\\b(i32)\\.(?:extend(?:8|16)_s)\\b",
+              "match": "\\b(i32)\\.extend(?:8|16)_s\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -153,7 +153,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "match": "\\b(i64)\\.(?:extend(?:8|16|32)_s)\\b",
+              "match": "\\b(i64)\\.extend(?:8|16|32)_s\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
@@ -291,7 +291,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "match": "\\b(i32)\\.(atomic)\\.(?:load(?:8_u|16_u)?|store(?:8|16)?|wait|(rmw)\\.(?:add|sub|and|or|xor|xchg|cmpxchg)|(rmw8|rmw16)\\.(?:add_u|sub_u|and_u|or_u|xor_u|xchg_u|cmpxchg_u))\\b",
+              "match": "\\b(i32)\\.(atomic)\\.(?:load(?:8_u|16_u)?|store(?:8|16)?|wait|(rmw)\\.(?:add|sub|and|or|xor|xchg|cmpxchg)|(rmw(?:8|16))\\.(?:add_u|sub_u|and_u|or_u|xor_u|xchg_u|cmpxchg_u))\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -309,7 +309,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "match": "\\b(i64)\\.(atomic)\\.(?:load(?:8_u|16_u|32_u)?|store(?:8|16|32)?|wait|(rmw)\\.(?:add|sub|and|or|xor|xchg|cmpxchg)|(rmw8|rmw16|rmw32)\\.(?:add_u|sub_u|and_u|or_u|xor_u|xchg_u|cmpxchg_u))\\b",
+              "match": "\\b(i64)\\.(atomic)\\.(?:load(?:8_u|16_u|32_u)?|store(?:8|16|32)?|wait|(rmw)\\.(?:add|sub|and|or|xor|xchg|cmpxchg)|(rmw(?:8|16|32))\\.(?:add_u|sub_u|and_u|or_u|xor_u|xchg_u|cmpxchg_u))\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -381,7 +381,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "match": "\\b(i32|i64|f32|f64|externref|funcref|nullref|exnref)\\.(?:push|pop)\\b",
+              "match": "\\b(i32|i64|f32|f64|externref|funcref|nullref|exnref)\\.p(?:ush|op)\\b",
               "name": "keyword.operator.word.wat"
             }
           ]
@@ -412,7 +412,7 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "match": "\\b(f32|f64)\\.(?:load|store)\\b",
+              "match": "\\b(f(?:32|64))\\.(?:load|store)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -456,7 +456,7 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "match": "\\b(i32|i64)\\.(const|eqz|eq|ne|lt_[su]|gt_[su]|le_[su]|ge_[su]|clz|ctz|popcnt|add|sub|mul|div_[su]|rem_[su]|and|or|xor|shl|shr_[su]|rotl|rotr)\\b",
+              "match": "\\b(i(?:32|64))\\.(const|eqz|eq|ne|lt_[su]|gt_[su]|le_[su]|ge_[su]|clz|ctz|popcnt|add|sub|mul|div_[su]|rem_[su]|and|or|xor|shl|shr_[su]|rotl|rotr)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -465,7 +465,7 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "match": "\\b(f32|f64)\\.(const|eq|ne|lt|gt|le|ge|abs|neg|ceil|floor|trunc|nearest|sqrt|add|sub|mul|div|min|max|copysign)\\b",
+              "match": "\\b(f(?:32|64))\\.(const|eq|ne|lt|gt|le|ge|abs|neg|ceil|floor|trunc|nearest|sqrt|add|sub|mul|div|min|max|copysign)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -474,7 +474,7 @@
                   "name": "support.class.type.wat"
                 }
               },
-              "match": "\\b(i32)\\.(wrap_i64|trunc_(f32|f64)_[su]|reinterpret_f32)\\b",
+              "match": "\\b(i32)\\.(wrap_i64|trunc_(f(?:32|64))_[su]|reinterpret_f32)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -558,7 +558,7 @@
                   "name": "support.class.wat"
                 }
               },
-              "match": "\\b(?:br_on_non_null|br_on_cast|br_on_cast_fail)\\b",
+              "match": "\\bbr_on_(?:non_null|cast|cast_fail)\\b",
               "name": "keyword.operator.word.wat"
             },
             {
@@ -617,10 +617,10 @@
                   "name": "entity.name.function.wat"
                 }
               },
-              "match": "(?<=\\(func|\\(start|call|return_call|ref\\.func)\\s+(\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*)"
+              "match": "(?<=\\(func|\\(start|call|return_call|ref\\.func)\\s+(\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\\\^_`|~]*)"
             },
             {
-              "begin": "\\)\\s+(\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*)",
+              "begin": "\\)\\s+(\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\\\^_`|~]*)",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.wat"
@@ -629,7 +629,7 @@
               "end": "\\)",
               "patterns": [
                 {
-                  "match": "(?<=\\s)\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*",
+                  "match": "(?<=\\s)\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\\\^_`|~]*",
                   "name": "entity.name.function.wat"
                 }
               ]
@@ -640,10 +640,10 @@
                   "name": "support.type.function.wat"
                 }
               },
-              "match": "(?<=\\(type)\\s+(\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*)"
+              "match": "(?<=\\(type)\\s+(\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\\\^_`|~]*)"
             },
             {
-              "match": "\\$[0-9A-Za-z!#$%&'*+\\-./:<=>?@\\\\^_`|~]*\\b",
+              "match": "\\$[0-9A-Za-z!#$%\\&'*+\\-./:<=>?@\\\\\\^_`|~]*\\b",
               "name": "variable.other.wat"
             }
           ]
@@ -666,7 +666,7 @@
       "name": "string.quoted.double.wat",
       "patterns": [
         {
-          "match": "\\\\(n|t|\\\\|'|\"|[0-9a-fA-F]{2})",
+          "match": "\\\\([nt\\\\'\"]|\\h{2})",
           "name": "constant.character.escape.wat"
         }
       ]

package/grammars/wenyan.json

@@ -50,11 +50,11 @@
     "constants": {
       "patterns": [
         {
-          "match": "負|·|又|零|〇|一|二|三|四|五|六|七|八|九|十|百|千|萬|億|兆|京|垓|秭|穰|溝|澗|正|載|極|分|釐|毫|絲|忽|微|纖|沙|塵|埃|渺|漠",
+          "match": "[負·又零〇一二三四五六七八九十百千萬億兆京垓秭穰溝澗正載極分釐毫絲忽微纖沙塵埃渺漠]",
           "name": "constant.numeric"
         },
         {
-          "match": "其|陰|陽",
+          "match": "[其陰陽]",
           "name": "constant.language"
         },
         {
@@ -80,7 +80,7 @@
     "keywords": {
       "patterns": [
         {
-          "match": "數|列|言|術|爻|物|元",
+          "match": "[數列言術爻物元]",
           "name": "storage.type"
         },
         {
@@ -92,15 +92,15 @@
           "name": "keyword.control"
         },
         {
-          "match": "中有陽乎|中無陰乎|所餘幾何|不等於|不大於|不小於|等於|大於|小於|加|減|乘|除|變|以|於",
+          "match": "中有陽乎|中無陰乎|所餘幾何|不等於|不大於|不小於|等於|大於|小於|[加減乘除變以於]",
           "name": "keyword.operator"
         },
         {
-          "match": "不知何禍歟|不復存矣|姑妄行此|如事不諧|名之曰|吾嘗觀|之禍歟|乃作罷|吾有|今有|物之|書之|以施|昔之|是矣|之書|方悟|之義|嗚呼|之禍|有|施|曰|噫|取|今|夫|中|豈",
+          "match": "不知何禍歟|不復存矣|姑妄行此|如事不諧|名之曰|吾嘗觀|之禍歟|乃作罷|吾有|今有|物之|書之|以施|昔之|是矣|之書|方悟|之義|嗚呼|之禍|[有施曰噫取今夫中豈]",
           "name": "keyword.other"
         },
         {
-          "match": "也|凡|遍|若|者|之|充|銜",
+          "match": "[也凡遍若者之充銜]",
           "name": "keyword.control"
         }
       ]
@@ -108,7 +108,7 @@
     "symbols": {
       "patterns": [
         {
-          "match": "。|、",
+          "match": "[。、]",
           "name": "punctuation.separator"
         }
       ]

package/grammars/wgsl.json

@@ -81,15 +81,15 @@
     "constants": {
       "patterns": [
         {
-          "match": "(-?\\b[0-9][0-9]*\\.[0-9][0-9]*)([eE][+-]?[0-9]+)?\\b",
+          "match": "(-?\\b[0-9][0-9]*\\.[0-9][0-9]*)([eE][+\\-]?[0-9]+)?\\b",
           "name": "constant.numeric.float.wgsl"
         },
         {
-          "match": "-?\\b0x[0-9a-fA-F]+\\b|\\b0\\b|-?\\b[1-9][0-9]*\\b",
+          "match": "-?\\b0x\\h+\\b|\\b0\\b|-?\\b[1-9][0-9]*\\b",
           "name": "constant.numeric.decimal.wgsl"
         },
         {
-          "match": "\\b0x[0-9a-fA-F]+u\\b|\\b0u\\b|\\b[1-9][0-9]*u\\b",
+          "match": "\\b(?:0x\\h+u\\b|0u\\b|[1-9][0-9]*u\\b)",
           "name": "constant.numeric.decimal.wgsl"
         },
         {
@@ -234,11 +234,11 @@
           "name": "keyword.other.fn.wgsl"
         },
         {
-          "match": "(\\^|\\||\\|\\||&&|<<|>>|!)(?!=)",
+          "match": "([\\^|]|\\|\\||&&|<<|>>|!)(?!=)",
           "name": "keyword.operator.logical.wgsl"
         },
         {
-          "match": "&(?![&=])",
+          "match": "&(?![\\&=])",
           "name": "keyword.operator.borrow.and.wgsl"
         },
         {
@@ -246,7 +246,7 @@
           "name": "keyword.operator.assignment.wgsl"
         },
         {
-          "match": "(?<![<>])=(?!=|>)",
+          "match": "(?<![<>])=(?![=>])",
           "name": "keyword.operator.assignment.equal.wgsl"
         },
         {
@@ -294,7 +294,7 @@
           "name": "punctuation.brackets.square.wgsl"
         },
         {
-          "match": "(?<![=-])[<>]",
+          "match": "(?<![=\\-])[<>]",
           "name": "punctuation.brackets.angle.wgsl"
         }
       ]
@@ -311,11 +311,11 @@
           "name": "storage.type.wgsl"
         },
         {
-          "match": "\\b(vec2i|vec3i|vec4i|vec2u|vec3u|vec4u|vec2f|vec3f|vec4f|vec2h|vec3h|vec4h)\\b",
+          "match": "\\b(vec(?:2i|3i|4i|2u|3u|4u|2f|3f|4f|2h|3h|4h))\\b",
           "name": "storage.type.wgsl"
         },
         {
-          "match": "\\b(mat2x2f|mat2x3f|mat2x4f|mat3x2f|mat3x3f|mat3x4f|mat4x2f|mat4x3f|mat4x4f|mat2x2h|mat2x3h|mat2x4h|mat3x2h|mat3x3h|mat3x4h|mat4x2h|mat4x3h|mat4x4h)\\b",
+          "match": "\\b(mat(?:2x2f|2x3f|2x4f|3x2f|3x3f|3x4f|4x2f|4x3f|4x4f|2x2h|2x3h|2x4h|3x2h|3x3h|3x4h|4x2h|4x3h|4x4h))\\b",
           "name": "storage.type.wgsl"
         },
         {