tm-grammars 1.22.2 → 1.22.4

package/grammars/c.json

@@ -119,7 +119,7 @@
   ],
   "repository": {
     "access-method": {
-      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.object.c"
@@ -503,7 +503,7 @@
       ]
     },
     "anon_pattern_range_8": {
-      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\])]))?(\\[)(?!\\])",
+      "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
       "beginCaptures": {
         "1": {
           "name": "variable.object.c"
@@ -749,7 +749,7 @@
                       "include": "#line_continuation_character"
                     },
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||--|---)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -834,7 +834,7 @@
                     "2": {
                       "patterns": [
                         {
-                          "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||--|---)\\b(?:\\{[^}]*\\})?",
+                          "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
                           "name": "storage.type.class.doxygen.c"
                         },
                         {
@@ -934,7 +934,7 @@
                   "name": "comment.block.documentation.c",
                   "patterns": [
                     {
-                      "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||--|---)\\b(?:\\{[^}]*\\})?",
+                      "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
                       "name": "storage.type.class.doxygen.c"
                     },
                     {
@@ -1571,7 +1571,7 @@
                       "name": "keyword.operator.plus.exponent.hexadecimal.c"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([pP])(\\+?)(-?)((?:\\d(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$"
+                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1624,7 +1624,7 @@
                       "name": "keyword.operator.plus.exponent.decimal.c"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))(\\d(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=\\d)\\.|\\.(?=\\d)))(\\d(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([eE])(\\+?)(-?)((?:\\d(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1711,7 +1711,7 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([pP])(\\+?)(-?)((?:\\d(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -1749,7 +1749,7 @@
                       "name": "keyword.other.unit.suffix.integer.c"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))(\\d(?:\\d|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([eE])(\\+?)(-?)((?:\\d(?:\\d|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$"
                 },
                 {
                   "match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
@@ -2073,7 +2073,7 @@
     "preprocessor-rule-conditional-line": {
       "patterns": [
         {
-          "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|:|&&|\\|\\||\\\\\\s*\\n)))",
+          "match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
           "name": "keyword.control.directive.conditional.c"
         },
         {
@@ -3005,7 +3005,7 @@
           "name": "variable.parameter.probably.c"
         }
       },
-      "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\])]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
+      "match": "(?<=(?:[a-zA-Z_0-9] |[&*>\\]\\)]))\\s*([a-zA-Z_]\\w*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))"
     },
     "static_assert": {
       "begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",

package/grammars/cadence.json

@@ -533,22 +533,22 @@
           "repository": {
             "binary": {
               "comment": "",
-              "match": "(\\B-|\\b)0b[01]([_01]*[01])?\\b",
+              "match": "(\\B\\-|\\b)0b[01]([_01]*[01])?\\b",
               "name": "constant.numeric.integer.binary.cadence"
             },
             "decimal": {
               "comment": "",
-              "match": "(\\B-|\\b)\\d([_0-9]*\\d)?\\b",
+              "match": "(\\B\\-|\\b)[0-9]([_0-9]*[0-9])?\\b",
               "name": "constant.numeric.integer.decimal.cadence"
             },
             "hexadecimal": {
               "comment": "",
-              "match": "(\\B-|\\b)0x[0-9A-Fa-f]([_0-9A-Fa-f]*[0-9A-Fa-f])?\\b",
+              "match": "(\\B\\-|\\b)0x[0-9A-Fa-f]([_0-9A-Fa-f]*[0-9A-Fa-f])?\\b",
               "name": "constant.numeric.integer.hexadecimal.cadence"
             },
             "octal": {
               "comment": "",
-              "match": "(\\B-|\\b)0o[0-7]([_0-7]*[0-7])?\\b",
+              "match": "(\\B\\-|\\b)0o[0-7]([_0-7]*[0-7])?\\b",
               "name": "constant.numeric.integer.octal.cadence"
             }
           }
@@ -600,7 +600,7 @@
     "operators": {
       "patterns": [
         {
-          "match": "-",
+          "match": "\\-",
           "name": "keyword.operator.arithmetic.unary.cadence"
         },
         {
@@ -620,7 +620,7 @@
           "name": "keyword.operator.force-move.cadence"
         },
         {
-          "match": "\\+|-|\\*|/",
+          "match": "\\+|\\-|\\*|/",
           "name": "keyword.operator.arithmetic.cadence"
         },
         {

package/grammars/cairo.json

@@ -51,7 +51,7 @@
       ]
     },
     {
-      "begin": "\\b(with_attr)\\s+([a-zA-Z_]\\w*)\\s*[({]",
+      "begin": "\\b(with_attr)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*[({]",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.with_attr"
@@ -99,11 +99,11 @@
       "name": "comment.line.sharp"
     },
     {
-      "match": "\\b[a-zA-Z_]\\w*:\\s*$",
+      "match": "\\b[a-zA-Z_][a-zA-Z0-9_]*:\\s*$",
       "name": "entity.name.function"
     },
     {
-      "begin": "\\b(func)\\s+([a-zA-Z_]\\w*)\\s*[({]",
+      "begin": "\\b(func)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*[({]",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.cairo"
@@ -127,7 +127,7 @@
       ]
     },
     {
-      "begin": "\\b(struct|namespace)\\s+([a-zA-Z_]\\w*)\\s*\\{",
+      "begin": "\\b(struct|namespace)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*\\{",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.cairo"
@@ -151,7 +151,7 @@
       ]
     },
     {
-      "match": "\\b[+-]?\\d+\\b",
+      "match": "\\b[+-]?[0-9]+\\b",
       "name": "constant.numeric.decimal"
     },
     {

package/grammars/clarity.json

@@ -32,7 +32,7 @@
   ],
   "repository": {
     "built-in-func": {
-      "begin": "(\\()\\s*(-|\\+|<=|>=|<|>|\\*|/|and|append|as-contract|as-max-len\\?|asserts!|at-block|begin|bit-and|bit-not|bit-or|bit-shift-left|bit-shift-right|bit-xor|buff-to-int-be|buff-to-int-le|buff-to-uint-be|buff-to-uint-le|concat|contract-call\\?|contract-of|default-to|element-at|element-at\\?|filter|fold|from-consensus-buff\\?|ft-burn\\?|ft-get-balance|ft-get-supply|ft-mint\\?|ft-transfer\\?|get-block-info\\?|get-burn-block-info\\?|get-stacks-block-info\\?|get-tenure-info\\?|get-burn-block-info\\?|hash160|if|impl-trait|index-of|index-of\\?|int-to-ascii|int-to-utf8|is-eq|is-err|is-none|is-ok|is-some|is-standard|keccak256|len|log2|map|match|merge|mod|nft-burn\\?|nft-get-owner\\?|nft-mint\\?|nft-transfer\\?|not|or|pow|principal-construct\\?|principal-destruct\\?|principal-of\\?|print|replace-at\\?|secp256k1-recover\\?|secp256k1-verify|sha256|sha512|sha512/256|slice\\?|sqrti|string-to-int\\?|string-to-uint\\?|stx-account|stx-burn\\?|stx-get-balance|stx-transfer-memo\\?|stx-transfer\\?|to-consensus-buff\\?|to-int|to-uint|try!|unwrap!|unwrap-err!|unwrap-err-panic|unwrap-panic|xor)\\s+",
+      "begin": "(\\()\\s*(\\-|\\+|<\\=|>\\=|<|>|\\*|/|and|append|as-contract|as-max-len\\?|asserts!|at-block|begin|bit-and|bit-not|bit-or|bit-shift-left|bit-shift-right|bit-xor|buff-to-int-be|buff-to-int-le|buff-to-uint-be|buff-to-uint-le|concat|contract-call\\?|contract-of|default-to|element-at|element-at\\?|filter|fold|from-consensus-buff\\?|ft-burn\\?|ft-get-balance|ft-get-supply|ft-mint\\?|ft-transfer\\?|get-block-info\\?|get-burn-block-info\\?|get-stacks-block-info\\?|get-tenure-info\\?|get-burn-block-info\\?|hash160|if|impl-trait|index-of|index-of\\?|int-to-ascii|int-to-utf8|is-eq|is-err|is-none|is-ok|is-some|is-standard|keccak256|len|log2|map|match|merge|mod|nft-burn\\?|nft-get-owner\\?|nft-mint\\?|nft-transfer\\?|not|or|pow|principal-construct\\?|principal-destruct\\?|principal-of\\?|print|replace-at\\?|secp256k1-recover\\?|secp256k1-verify|sha256|sha512|sha512/256|slice\\?|sqrti|string-to-int\\?|string-to-uint\\?|stx-account|stx-burn\\?|stx-get-balance|stx-transfer-memo\\?|stx-transfer\\?|to-consensus-buff\\?|to-int|to-uint|try!|unwrap!|unwrap-err!|unwrap-err-panic|unwrap-panic|xor)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.built-in-function.start.clarity"
@@ -206,7 +206,7 @@
           "name": "meta.tuple-def",
           "patterns": [
             {
-              "match": "([a-zA-Z][\\w?!\\-]*)(?=:)",
+              "match": "([a-zA-Z][\\w\\?\\!\\-]*)(?=:)",
               "name": "entity.name.tag.tuple-data-type-key.clarity"
             },
             {
@@ -217,7 +217,7 @@
       ]
     },
     "define-constant": {
-      "begin": "(\\()\\s*(define-constant)\\s+([a-zA-Z][\\w?!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-constant)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-constant.start.clarity"
@@ -243,7 +243,7 @@
       ]
     },
     "define-data-var": {
-      "begin": "(\\()\\s*(define-data-var)\\s+([a-zA-Z][\\w?!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-data-var)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-data-var.start.clarity"
@@ -293,7 +293,7 @@
           "include": "#expression"
         },
         {
-          "begin": "(\\()\\s*([a-zA-Z][\\w?!\\-]*)\\s*",
+          "begin": "(\\()\\s*([a-zA-Z][\\w\\?\\!\\-]*)\\s*",
           "beginCaptures": {
             "1": {
               "name": "punctuation.function-signature.start.clarity"
@@ -311,7 +311,7 @@
           "name": "meta.define-function-signature",
           "patterns": [
             {
-              "begin": "(\\()\\s*([a-zA-Z][\\w?!\\-]*)\\s+",
+              "begin": "(\\()\\s*([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.function-argument.start.clarity"
@@ -358,10 +358,10 @@
           "name": "punctuation.define-fungible-token.end.clarity"
         }
       },
-      "match": "(\\()\\s*(define-fungible-token)\\s+([a-zA-Z][\\w?!\\-]*)(?:\\s+(u\\d+))?"
+      "match": "(\\()\\s*(define-fungible-token)\\s+([a-zA-Z][\\w\\?\\!\\-]*)(?:\\s+(u\\d+))?"
     },
     "define-map": {
-      "begin": "(\\()\\s*(define-map)\\s+([a-zA-Z][\\w?!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-map)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-map.start.clarity"
@@ -390,7 +390,7 @@
       ]
     },
     "define-non-fungible-token": {
-      "begin": "(\\()\\s*(define-non-fungible-token)\\s+([a-zA-Z][\\w?!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-non-fungible-token)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-non-fungible-token.start.clarity"
@@ -416,7 +416,7 @@
       ]
     },
     "define-trait": {
-      "begin": "(\\()\\s*(define-trait)\\s+([a-zA-Z][\\w?!\\-]*)\\s+",
+      "begin": "(\\()\\s*(define-trait)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.define-trait.start.clarity"
@@ -455,7 +455,7 @@
               "include": "#expression"
             },
             {
-              "begin": "(\\()\\s*([a-zA-Z][\\w!?\\-]*)\\s+",
+              "begin": "(\\()\\s*([a-zA-Z][\\w\\!\\?\\-]*)\\s+",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.trait-function.start.clarity"
@@ -524,7 +524,7 @@
       ]
     },
     "get-set-func": {
-      "begin": "(\\()\\s*(var-get|var-set|map-get\\?|map-set|map-insert|map-delete|get)\\s+([a-zA-Z][\\w?!\\-]*)\\s*",
+      "begin": "(\\()\\s*(var-get|var-set|map-get\\?|map-set|map-insert|map-delete|get)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s*",
       "beginCaptures": {
         "1": {
           "name": "punctuation.get-set-func.start.clarity"
@@ -593,7 +593,7 @@
           "name": "meta.let-var",
           "patterns": [
             {
-              "begin": "(\\()([a-zA-Z][\\w?!\\-]*)\\s+",
+              "begin": "(\\()([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.let-local-var.start.clarity"
@@ -807,7 +807,7 @@
           "name": "meta.tuple",
           "patterns": [
             {
-              "match": "([a-zA-Z][\\w?!\\-]*)(?=:)",
+              "match": "([a-zA-Z][\\w\\?\\!\\-]*)(?=:)",
               "name": "entity.name.tag.tuple-key.clarity"
             },
             {
@@ -821,7 +821,7 @@
       }
     },
     "use-trait": {
-      "begin": "(\\()\\s*(use-trait)\\s+([a-zA-Z][\\w?!\\-]*)\\s+",
+      "begin": "(\\()\\s*(use-trait)\\s+([a-zA-Z][\\w\\?\\!\\-]*)\\s+",
       "beginCaptures": {
         "1": {
           "name": "punctuation.use-trait.start.clarity"
@@ -847,7 +847,7 @@
       ]
     },
     "user-func": {
-      "begin": "(\\()\\s*(([a-zA-Z][\\w?!\\-]*))\\s*",
+      "begin": "(\\()\\s*(([a-zA-Z][\\w\\?\\!\\-]*))\\s*",
       "beginCaptures": {
         "1": {
           "name": "punctuation.user-function.start.clarity"

package/grammars/clojure.json

@@ -93,7 +93,7 @@
           "name": "constant.numeric.octal.clojure"
         },
         {
-          "match": "([-+]?\\d+(?:(\\.|(?=[eEM]))\\d*([eE][-+]?\\d+)?)M?)",
+          "match": "([-+]?[0-9]+(?:(\\.|(?=[eEM]))[0-9]*([eE][-+]?[0-9]+)?)M?)",
           "name": "constant.numeric.double.clojure"
         },
         {
@@ -106,13 +106,13 @@
       ]
     },
     "dynamic-variables": {
-      "match": "\\*[\\w\\.\\-_:+=><!?\\d]+\\*",
+      "match": "\\*[\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\d]+\\*",
       "name": "meta.symbol.dynamic.clojure"
     },
     "keyfn": {
       "patterns": [
         {
-          "match": "(?<=(\\s|\\(|\\[|\\{))(if(-[-\\p{Ll}?]*)?|when(-[-\\p{Ll}]*)?|for(-[-\\p{Ll}]*)?|cond|do|let(-[-\\p{Ll}?]*)?|binding|loop|recur|fn|throw[\\p{Ll}\\-]*|try|catch|finally|([\\p{Ll}]*case))(?=(\\s|\\)|\\]|\\}))",
+          "match": "(?<=(\\s|\\(|\\[|\\{))(if(-[-\\p{Ll}\\?]*)?|when(-[-\\p{Ll}]*)?|for(-[-\\p{Ll}]*)?|cond|do|let(-[-\\p{Ll}\\?]*)?|binding|loop|recur|fn|throw[\\p{Ll}\\-]*|try|catch|finally|([\\p{Ll}]*case))(?=(\\s|\\)|\\]|\\}))",
           "name": "storage.control.clojure"
         },
         {
@@ -122,7 +122,7 @@
       ]
     },
     "keyword": {
-      "match": "(?<=(\\s|\\(|\\[|\\{)):[\\w#\\.\\-_:+=><\\/!?\\*]+(?=(\\s|\\)|\\]|\\}|\\,))",
+      "match": "(?<=(\\s|\\(|\\[|\\{)):[\\w\\#\\.\\-\\_\\:\\+\\=\\>\\<\\/\\!\\?\\*]+(?=(\\s|\\)|\\]|\\}|\\,))",
       "name": "constant.keyword.clojure"
     },
     "map": {
@@ -132,7 +132,7 @@
           "name": "punctuation.section.map.begin.clojure"
         }
       },
-      "end": "(\\}(?=[}\\])\\s]*(?:;|$)))|(\\})",
+      "end": "(\\}(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\})",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.map.end.trailing.clojure"
@@ -157,7 +157,7 @@
               "name": "punctuation.section.metadata.map.begin.clojure"
             }
           },
-          "end": "(\\}(?=[}\\])\\s]*(?:;|$)))|(\\})",
+          "end": "(\\}(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.metadata.map.end.trailing.clojure"
@@ -196,7 +196,7 @@
               "name": "meta.symbol.namespace.clojure"
             }
           },
-          "match": "([\\p{L}\\.\\-_+=><!?\\*][\\w\\.\\-_:+=><!?\\*\\d]*)/"
+          "match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)/"
         }
       ]
     },
@@ -207,7 +207,7 @@
           "name": "punctuation.section.expression.begin.clojure"
         }
       },
-      "end": "(\\))$|(\\)(?=[}\\])\\s]*(?:;|$)))|(\\))",
+      "end": "(\\))$|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.expression.end.trailing.clojure"
@@ -257,7 +257,7 @@
           "name": "punctuation.section.set.begin.clojure"
         }
       },
-      "end": "(\\}(?=[}\\])\\s]*(?:;|$)))|(\\})",
+      "end": "(\\}(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\})",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.set.end.trailing.clojure"
@@ -280,7 +280,7 @@
           "name": "punctuation.section.expression.begin.clojure"
         }
       },
-      "end": "(\\))$|(\\)(?=[}\\])\\s]*(?:;|$)))|(\\))",
+      "end": "(\\))$|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.expression.end.trailing.clojure"
@@ -311,7 +311,7 @@
               "include": "#dynamic-variables"
             },
             {
-              "match": "([\\p{L}\\.\\-_+=><!?\\*][\\w\\.\\-_:+=><!?\\*\\d]*)",
+              "match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
               "name": "entity.global.clojure"
             },
             {
@@ -389,13 +389,13 @@
     "symbol": {
       "patterns": [
         {
-          "match": "([\\p{L}\\.\\-_+=><!?\\*][\\w\\.\\-_:+=><!?\\*\\d]*)",
+          "match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
           "name": "meta.symbol.clojure"
         }
       ]
     },
     "var": {
-      "match": "(?<=(\\s|\\(|\\[|\\{)\\#)'[\\w\\.\\-_:+=><\\/!?\\*]+(?=(\\s|\\)|\\]|\\}))",
+      "match": "(?<=(\\s|\\(|\\[|\\{)\\#)'[\\w\\.\\-\\_\\:\\+\\=\\>\\<\\/\\!\\?\\*]+(?=(\\s|\\)|\\]|\\}))",
       "name": "meta.var.clojure"
     },
     "vector": {
@@ -405,7 +405,7 @@
           "name": "punctuation.section.vector.begin.clojure"
         }
       },
-      "end": "(\\](?=[}\\])\\s]*(?:;|$)))|(\\])",
+      "end": "(\\](?=[\\}\\]\\)\\s]*(?:;|$)))|(\\])",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.vector.end.trailing.clojure"