tm-grammars 1.22.3 → 1.22.5

package/grammars/typespec.json

@@ -26,7 +26,7 @@
       ]
     },
     "alias-statement": {
-      "begin": "\\b(alias)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*",
+      "begin": "\\b(alias)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -47,7 +47,7 @@
       ]
     },
     "augment-decorator-statement": {
-      "begin": "((@@)\\b[_$A-Za-z](?:[_$0-9A-Za-z]|\\.[_$A-Za-z])*\\b)",
+      "begin": "((@@)\\b[_$[:alpha:]](?:[_$[:alnum:]]|\\.[_$[:alpha:]])*\\b)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.tsp"
@@ -56,7 +56,7 @@
           "name": "entity.name.tag.tsp"
         }
       },
-      "end": "(?=[_$A-Za-z])|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[_$[:alpha:]])|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.augment-decorator-statement.typespec",
       "patterns": [
         {
@@ -77,7 +77,7 @@
       "name": "constant.language.tsp"
     },
     "callExpression": {
-      "begin": "(\\b[_$A-Za-z](?:[_$0-9A-Za-z]|\\.[_$A-Za-z])*\\b)\\s*(\\()",
+      "begin": "(\\b[_$[:alpha:]](?:[_$[:alnum:]]|\\.[_$[:alpha:]])*\\b)\\s*(\\()",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.tsp"
@@ -106,7 +106,7 @@
       ]
     },
     "const-statement": {
-      "begin": "\\b(const)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "\\b(const)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -130,7 +130,7 @@
       ]
     },
     "decorator": {
-      "begin": "((@)\\b[_$A-Za-z](?:[_$0-9A-Za-z]|\\.[_$A-Za-z])*\\b)",
+      "begin": "((@)\\b[_$[:alpha:]](?:[_$[:alnum:]]|\\.[_$[:alpha:]])*\\b)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.tsp"
@@ -139,7 +139,7 @@
           "name": "entity.name.tag.tsp"
         }
       },
-      "end": "(?=[_$A-Za-z])|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[_$[:alpha:]])|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.decorator.typespec",
       "patterns": [
         {
@@ -151,7 +151,7 @@
       ]
     },
     "decorator-declaration-statement": {
-      "begin": "(?:(extern)\\s+)?\\b(dec)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "(?:(extern)\\s+)?\\b(dec)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -175,7 +175,7 @@
       ]
     },
     "directive": {
-      "begin": "\\s*(#\\b[_$A-Za-z][_$0-9A-Za-z]*\\b)",
+      "begin": "\\s*(#\\b[_$[:alpha:]][_$[:alnum:]]*\\b)",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.name.tsp"
@@ -237,7 +237,7 @@
           "name": "variable.name.tsp"
         }
       },
-      "match": "((@)(?:param|template|prop))\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\b",
+      "match": "((@)(?:param|template|prop))\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\b",
       "name": "comment.block.tsp"
     },
     "doc-comment-return-tag": {
@@ -261,7 +261,7 @@
           "name": "entity.name.tag.tsp"
         }
       },
-      "match": "((@)(?:\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`))\\b",
+      "match": "((@)(?:\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`))\\b",
       "name": "comment.block.tsp"
     },
     "else-expression": {
@@ -336,7 +336,7 @@
       ]
     },
     "enum-member": {
-      "begin": "(?:(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:?))",
+      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:?))",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"
@@ -357,7 +357,7 @@
       ]
     },
     "enum-statement": {
-      "begin": "\\b(enum)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "\\b(enum)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -422,7 +422,7 @@
       ]
     },
     "function-call": {
-      "begin": "(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(\\()",
+      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(\\()",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.tsp"
@@ -445,7 +445,7 @@
       ]
     },
     "function-declaration-statement": {
-      "begin": "(?:(extern)\\s+)?\\b(fn)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "(?:(extern)\\s+)?\\b(fn)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -472,7 +472,7 @@
       ]
     },
     "identifier-expression": {
-      "match": "\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`",
+      "match": "\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`",
       "name": "entity.name.type.tsp"
     },
     "if-expression": {
@@ -559,7 +559,7 @@
       ]
     },
     "interface-member": {
-      "begin": "(?:\\b(op)\\b\\s+)?(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "(?:\\b(op)\\b\\s+)?(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -664,7 +664,7 @@
       ]
     },
     "model-property": {
-      "begin": "(?:(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)|(\\\"(?:[^\\\"\\\\]|\\\\.)*\\\"))",
+      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)|(\\\"(?:[^\\\"\\\\]|\\\\.)*\\\"))",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"
@@ -735,7 +735,7 @@
       ]
     },
     "namespace-name": {
-      "begin": "(?=[_$A-Za-z])",
+      "begin": "(?=[_$[:alpha:]])",
       "end": "((?=\\{)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
       "name": "meta.namespace-name.typespec",
       "patterns": [
@@ -769,7 +769,7 @@
       ]
     },
     "numeric-literal": {
-      "match": "(?:\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)|\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)|(?<!\\$)(?:(?:\\b\\d[0-9_]*(\\.)\\d[0-9_]*[eE][+-]?\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*(\\.)[eE][+-]?\\d[0-9_]*(n)?\\b)|(?:\\B(\\.)\\d[0-9_]*[eE][+-]?\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*[eE][+-]?\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*(\\.)\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*(n)?\\b(?!\\.)))(?!\\$))",
+      "match": "(?:\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$)|\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$)|(?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$))",
       "name": "constant.numeric.tsp"
     },
     "object-literal": {
@@ -805,7 +805,7 @@
       ]
     },
     "object-literal-property": {
-      "begin": "(?:(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:))",
+      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:))",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"
@@ -889,7 +889,7 @@
       ]
     },
     "operation-statement": {
-      "begin": "\\b(op)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "\\b(op)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -994,7 +994,7 @@
       ]
     },
     "projection-parameter": {
-      "begin": "(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"
@@ -1029,7 +1029,7 @@
       ]
     },
     "projection-statement": {
-      "begin": "\\b(projection)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)(#)(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "\\b(projection)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)(#)(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -1114,7 +1114,7 @@
       ]
     },
     "scalar-constructor": {
-      "begin": "\\b(init)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "\\b(init)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -1153,7 +1153,7 @@
       ]
     },
     "scalar-statement": {
-      "begin": "\\b(scalar)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "\\b(scalar)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -1388,7 +1388,7 @@
       ]
     },
     "type-argument": {
-      "begin": "(?:(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(=))",
+      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(=))",
       "beginCaptures": {
         "1": {
           "name": "entity.name.type.tsp"
@@ -1443,7 +1443,7 @@
       ]
     },
     "type-parameter": {
-      "begin": "(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.type.tsp"
@@ -1567,7 +1567,7 @@
       ]
     },
     "union-statement": {
-      "begin": "\\b(union)\\b\\s+(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
+      "begin": "\\b(union)\\b\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.tsp"
@@ -1588,7 +1588,7 @@
       ]
     },
     "union-variant": {
-      "begin": "(?:(\\b[_$A-Za-z][_$0-9A-Za-z]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:))",
+      "begin": "(?:(\\b[_$[:alpha:]][_$[:alnum:]]*\\b|`(?:[^`\\\\]|\\\\.)*`)\\s*(:))",
       "beginCaptures": {
         "1": {
           "name": "variable.name.tsp"

package/grammars/typst.json

@@ -10,7 +10,7 @@
     "arguments": {
       "patterns": [
         {
-          "match": "\\b[A-Za-z_][0-9A-Za-z_-]*(?=:)",
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*(?=:)",
           "name": "variable.parameter.typst"
         },
         {
@@ -84,7 +84,7 @@
           "name": "keyword.operator.assignment.typst"
         },
         {
-          "match": "\\+|\\*|/|(?<![A-Za-z_][0-9A-Za-z_-]*)-(?![0-9A-Za-z]_-]*[A-Za-z_])",
+          "match": "\\+|\\*|/|(?<![[:alpha:]_][[:alnum:]_-]*)-(?![:alnum:]_-]*[[:alpha:]_])",
           "name": "keyword.operator.arithmetic.typst"
         },
         {
@@ -116,16 +116,16 @@
         },
         {
           "comment": "Function name",
-          "match": "\\b[A-Za-z_][0-9A-Za-z_-]*!?(?=\\[|\\()",
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*!?(?=\\[|\\()",
           "name": "entity.name.function.typst"
         },
         {
           "comment": "Function name",
-          "match": "(?<=\\bshow\\s*)\\b[A-Za-z_][0-9A-Za-z_-]*(?=\\s*[:.])",
+          "match": "(?<=\\bshow\\s*)\\b[[:alpha:]_][[:alnum:]_-]*(?=\\s*[:.])",
           "name": "entity.name.function.typst"
         },
         {
-          "begin": "(?<=\\b[A-Za-z_][0-9A-Za-z_-]*!?)\\(",
+          "begin": "(?<=\\b[[:alpha:]_][[:alnum:]_-]*!?)\\(",
           "captures": {
             "0": {
               "name": "punctuation.definition.group.typst"
@@ -140,7 +140,7 @@
           ]
         },
         {
-          "match": "\\b[A-Za-z_][0-9A-Za-z_-]*\\b",
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*\\b",
           "name": "variable.other.typst"
         },
         {
@@ -335,7 +335,7 @@
           ]
         },
         {
-          "match": "https?://[0-9a-zA-Z~/%#&=',;\\.+?]*",
+          "match": "https?://[0-9a-zA-Z~/%#&=',;\\.\\+\\?]*",
           "name": "markup.underline.link.typst"
         },
         {
@@ -389,7 +389,7 @@
           "name": "punctuation.definition.list.unnumbered.typst"
         },
         {
-          "match": "^\\s*(\\d*\\.|\\+)\\s+",
+          "match": "^\\s*([0-9]*\\.|\\+)\\s+",
           "name": "punctuation.definition.list.numbered.typst"
         },
         {
@@ -409,7 +409,7 @@
               "name": "punctuation.definition.label.typst"
             }
           },
-          "match": "<[A-Za-z_][0-9A-Za-z_-]*>",
+          "match": "<[[:alpha:]_][[:alnum:]_-]*>",
           "name": "entity.other.label.typst"
         },
         {
@@ -418,7 +418,7 @@
               "name": "punctuation.definition.reference.typst"
             }
           },
-          "match": "(@)[A-Za-z_][0-9A-Za-z_-]*",
+          "match": "(@)[[:alpha:]_][[:alnum:]_-]*",
           "name": "entity.other.reference.typst"
         },
         {
@@ -533,11 +533,11 @@
             }
           },
           "comment": "Function name",
-          "match": "((#)[A-Za-z_][0-9A-Za-z_-]*!?)(?=\\[|\\()",
+          "match": "((#)[[:alpha:]_][[:alnum:]_-]*!?)(?=\\[|\\()",
           "name": "entity.name.function.typst"
         },
         {
-          "begin": "(?<=#[A-Za-z_][0-9A-Za-z_-]*!?)\\(",
+          "begin": "(?<=#[[:alpha:]_][[:alnum:]_-]*!?)\\(",
           "captures": {
             "0": {
               "name": "punctuation.definition.group.typst"
@@ -557,7 +557,7 @@
               "name": "punctuation.definition.variable.typst"
             }
           },
-          "match": "(#)[A-Za-z_][.0-9A-Za-z_-]*",
+          "match": "(#)[[:alpha:]_][.[:alnum:]_-]*",
           "name": "entity.other.interpolated.typst"
         },
         {

package/grammars/v.json

@@ -122,7 +122,7 @@
           ]
         }
       },
-      "match": "\\s+((?::|\\+|-|\\*|/|\\%|\\&|\\||\\^)?=)\\s+",
+      "match": "\\s+((?:\\:|\\+|\\-|\\*|/|\\%|\\&|\\||\\^)?=)\\s+",
       "name": "meta.definition.variable.v"
     },
     "attributes": {
@@ -326,7 +326,7 @@
           ]
         }
       },
-      "match": "^(\\bpub\\b\\s+)?(\\bfn\\b)\\s+(?:\\([^)]+\\)\\s+)?(?:(?:C\\.)?)(\\w+)\\s*((?<=[\\w\\s+])(<)(\\w+)(>))?",
+      "match": "^(\\bpub\\b\\s+)?(\\bfn\\b)\\s+(?:\\([^\\)]+\\)\\s+)?(?:(?:C\\.)?)(\\w+)\\s*((?<=[\\w\\s+])(\\<)(\\w+)(\\>))?",
       "name": "meta.definition.function.v"
     },
     "function-exist": {
@@ -353,7 +353,7 @@
           ]
         }
       },
-      "match": "(\\w+)((?<=[\\w\\s+])(<)(\\w+)(>))?(?=\\s*\\()",
+      "match": "(\\w+)((?<=[\\w\\s+])(\\<)(\\w+)(\\>))?(?=\\s*\\()",
       "name": "meta.support.function.v"
     },
     "function-extend-decl": {
@@ -408,7 +408,7 @@
           ]
         }
       },
-      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^)]*)(\\))\\s*(?:(?:C\\.)?)(\\w+)\\s*((?<=[\\w\\s+])(<)(\\w+)(>))?",
+      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^\\)]*)(\\))\\s*(?:(?:C\\.)?)(\\w+)\\s*((?<=[\\w\\s+])(\\<)(\\w+)(\\>))?",
       "name": "meta.definition.function.v"
     },
     "function-limited-overload-decl": {
@@ -488,7 +488,7 @@
           "name": "punctuation.definition.bracket.round.end.v"
         }
       },
-      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^)]*)(\\))\\s*([+\\-\\*\\/])?\\s*(\\()([^)]*)(\\))\\s*(?:(?:C\\.)?)(\\w+)",
+      "match": "^\\s*(pub)?\\s*(fn)\\s*(\\()([^\\)]*)(\\))\\s*([\\+\\-\\*\\/])?\\s*(\\()([^\\)]*)(\\))\\s*(?:(?:C\\.)?)(\\w+)",
       "name": "meta.definition.function.v"
     },
     "generic": {
@@ -513,7 +513,7 @@
               "name": "punctuation.definition.bracket.angle.end.v"
             }
           },
-          "match": "(?<=[\\w\\s+])(<)(\\w+)(>)",
+          "match": "(?<=[\\w\\s+])(\\<)(\\w+)(\\>)",
           "name": "meta.definition.generic.v"
         }
       ]
@@ -599,11 +599,11 @@
     "numbers": {
       "patterns": [
         {
-          "match": "(\\d+(_?))+(\\.)(\\d+[eE][-+]?\\d+)",
+          "match": "([0-9]+(_?))+(\\.)([0-9]+[eE][-+]?[0-9]+)",
           "name": "constant.numeric.exponential.v"
         },
         {
-          "match": "(\\d+(_?))+(\\.)(\\d+)",
+          "match": "([0-9]+(_?))+(\\.)([0-9]+)",
           "name": "constant.numeric.float.v"
         },
         {
@@ -619,7 +619,7 @@
           "name": "constant.numeric.hex.v"
         },
         {
-          "match": "(?:(?:\\d+)(?:[_]?))+",
+          "match": "(?:(?:[0-9]+)(?:[_]?))+",
           "name": "constant.numeric.integer.v"
         }
       ]
@@ -627,15 +627,15 @@
     "operators": {
       "patterns": [
         {
-          "match": "(\\+|-|\\*|\\/|\\%|\\+\\+|--|>>|<<)",
+          "match": "(\\+|\\-|\\*|\\/|\\%|\\+\\+|\\-\\-|\\>\\>|\\<\\<)",
           "name": "keyword.operator.arithmetic.v"
         },
         {
-          "match": "(==|!=|>|<|>=|<=)",
+          "match": "(\\=\\=|\\!\\=|\\>|\\<|\\>\\=|\\<\\=)",
           "name": "keyword.operator.relation.v"
         },
         {
-          "match": "(:=|=|\\+=|-=|\\*=|\\/=|\\%=|\\&=|\\|=|\\^=|\\~=|\\&\\&=|\\|\\|=|>>=|<<=)",
+          "match": "(\\:\\=|\\=|\\+\\=|\\-\\=|\\*\\=|\\/\\=|\\%\\=|\\&\\=|\\|\\=|\\^\\=|\\~\\=|\\&\\&\\=|\\|\\|\\=|\\>\\>\\=|\\<\\<\\=)",
           "name": "keyword.operator.assignment.v"
         },
         {
@@ -643,7 +643,7 @@
           "name": "keyword.operator.bitwise.v"
         },
         {
-          "match": "(\\&\\&|\\|\\||!)",
+          "match": "(\\&\\&|\\|\\||\\!)",
           "name": "keyword.operator.logical.v"
         },
         {
@@ -699,11 +699,11 @@
     "string-escaped-char": {
       "patterns": [
         {
-          "match": "\\\\([0-7]{3}|[$abfnrtv\\\\'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})",
+          "match": "\\\\([0-7]{3}|[\\$abfnrtv\\\\'\"]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})",
           "name": "constant.character.escape.v"
         },
         {
-          "match": "\\\\[^0-7$xuUabfnrtv\\'\"]",
+          "match": "\\\\[^0-7\\$xuUabfnrtv\\'\"]",
           "name": "invalid.illegal.unknown-escape.v"
         }
       ]
@@ -727,7 +727,7 @@
       "name": "meta.string.interpolation.v"
     },
     "string-placeholder": {
-      "match": "%(\\[\\d+\\])?([+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGsp]",
+      "match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGsp]",
       "name": "constant.other.placeholder.v"
     },
     "strings": {

package/grammars/vala.json

@@ -84,7 +84,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|((\\d+\\.?\\d*)|(\\.\\d+))((e|E)(\\+|-)?\\d+)?)([LlFfUuDd]|UL|ul)?\\b",
+          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
           "name": "constant.numeric.vala"
         },
         {

package/grammars/vb.json

@@ -181,7 +181,7 @@
       "name": "support.function.vb.asp"
     },
     {
-      "match": "-?\\b((0(x|X)[0-9a-fA-F]*)|((\\d+\\.?\\d*)|(\\.\\d+))((e|E)(\\+|-)?\\d+)?)(L|l|UL|ul|u|U|F|f)?\\b",
+      "match": "-?\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?\\b",
       "name": "constant.numeric.asp"
     },
     {
@@ -202,7 +202,7 @@
       "name": "variable.other.asp"
     },
     {
-      "match": "!|\\$|%|&|\\*|--|-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?:|\\*=|/=|%=|\\+=|-=|&=|\\^=|\\b(in|instanceof|new|delete|typeof|void)\\b",
+      "match": "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|/=|%=|\\+=|\\-=|&=|\\^=|\\b(in|instanceof|new|delete|typeof|void)\\b",
       "name": "keyword.operator.js"
     }
   ],

package/grammars/verilog.json

@@ -63,7 +63,7 @@
           "name": "variable.other.constant.verilog"
         },
         {
-          "match": "\\d*'[bBoOdDhH][a-fA-F0-9_xXzZ]+\\b",
+          "match": "[0-9]*'[bBoOdDhH][a-fA-F0-9_xXzZ]+\\b",
           "name": "constant.numeric.sized_integer.verilog"
         },
         {
@@ -105,7 +105,7 @@
           "include": "#keywords"
         },
         {
-          "begin": "^\\s*(?!always|and|assign|output|input|inout|wire|module)([a-zA-Z]\\w*)\\s+([a-zA-Z]\\w*)(?<!begin|if)\\s*(?=\\(|$)",
+          "begin": "^\\s*(?!always|and|assign|output|input|inout|wire|module)([a-zA-Z][a-zA-Z0-9_]*)\\s+([a-zA-Z][a-zA-Z0-9_]*)(?<!begin|if)\\s*(?=\\(|$)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.module.reference.verilog"
@@ -134,7 +134,7 @@
           ]
         },
         {
-          "begin": "^\\s*([a-zA-Z]\\w*)\\s*(#)(?=\\s*\\()",
+          "begin": "^\\s*([a-zA-Z][a-zA-Z0-9_]*)\\s*(#)(?=\\s*\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.module.reference.verilog"
@@ -152,7 +152,7 @@
               "include": "#parenthetical_list"
             },
             {
-              "match": "[a-zA-Z]\\w*",
+              "match": "[a-zA-Z][a-zA-Z0-9_]*",
               "name": "entity.name.tag.module.identifier.verilog"
             }
           ]
@@ -202,7 +202,7 @@
     "module_pattern": {
       "patterns": [
         {
-          "begin": "\\b(module)\\s+([a-zA-Z]\\w*)",
+          "begin": "\\b(module)\\s+([a-zA-Z][a-zA-Z0-9_]*)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.module.verilog"