tm-grammars 1.22.19 → 1.23.0

package/grammars/cadence.json

@@ -32,7 +32,7 @@
           "name": "punctuation.section.scope.begin.cadence"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.cadence"
@@ -174,7 +174,7 @@
       }
     },
     "composite": {
-      "begin": "\\b((?:(?:struct|resource|contract)(?:\\s+interface)?)|transaction|enum)\\s+([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*)",
+      "begin": "\\b((?:struct|resource|contract)(?:\\s+interface)?|transaction|enum)\\s+([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.$1.cadence"
@@ -183,7 +183,7 @@
           "name": "entity.name.type.$1.cadence"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "name": "meta.definition.type.composite.cadence",
       "patterns": [
         {
@@ -199,7 +199,7 @@
               "name": "punctuation.definition.type.begin.cadence"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.type.end.cadence"
@@ -337,7 +337,7 @@
           "name": "entity.name.function.cadence"
         }
       },
-      "end": "(?<=\\})|$",
+      "end": "(?<=})|$",
       "name": "meta.definition.function.cadence",
       "patterns": [
         {
@@ -356,7 +356,7 @@
               "name": "punctuation.section.function.begin.cadence"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.end.cadence"
@@ -399,13 +399,13 @@
       ]
     },
     "function-result": {
-      "begin": "(?<![/=\\-+!*%<>&|\\^~.])(:)(?![/=\\-+!*%<>&|\\^~.])\\s*",
+      "begin": "(?<![/=\\-+!*%<>\\&|\\^~.])(:)(?![/=\\-+!*%<>\\&|\\^~.])\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.function-result.cadence"
         }
       },
-      "end": "(?!\\G)(?=\\{|;)|$",
+      "end": "(?!\\G)(?=[{;])|$",
       "name": "meta.function-result.cadence",
       "patterns": [
         {
@@ -414,13 +414,13 @@
       ]
     },
     "initializer": {
-      "begin": "(?<!\\.)\\b(init)\\s*(?=\\(|<)",
+      "begin": "(?<!\\.)\\b(init)\\s*(?=[(<])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.cadence"
         }
       },
-      "end": "(?<=\\})|$",
+      "end": "(?<=})|$",
       "name": "meta.definition.function.initializer.cadence",
       "patterns": [
         {
@@ -436,7 +436,7 @@
               "name": "punctuation.section.function.begin.cadence"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.end.cadence"
@@ -529,19 +529,19 @@
           ],
           "repository": {
             "binary": {
-              "match": "(\\B\\-|\\b)0b[01]([_01]*[01])?\\b",
+              "match": "(\\B-|\\b)0b[01]([_01]*[01])?\\b",
               "name": "constant.numeric.integer.binary.cadence"
             },
             "decimal": {
-              "match": "(\\B\\-|\\b)[0-9]([_0-9]*[0-9])?\\b",
+              "match": "(\\B-|\\b)[0-9]([_0-9]*[0-9])?\\b",
               "name": "constant.numeric.integer.decimal.cadence"
             },
             "hexadecimal": {
-              "match": "(\\B\\-|\\b)0x[0-9A-Fa-f]([_0-9A-Fa-f]*[0-9A-Fa-f])?\\b",
+              "match": "(\\B-|\\b)0x\\h([_\\h]*\\h)?\\b",
               "name": "constant.numeric.integer.hexadecimal.cadence"
             },
             "octal": {
-              "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"
             }
           }
@@ -564,7 +564,7 @@
               "name": "string.quoted.double.single-line.cadence",
               "patterns": [
                 {
-                  "match": "\\r|\\n",
+                  "match": "[\\r\\n]",
                   "name": "invalid.illegal.returns-not-allowed.cadence"
                 },
                 {
@@ -581,7 +581,7 @@
                   "name": "constant.character.escape.cadence"
                 },
                 {
-                  "match": "\\\\u\\{[0-9a-fA-F]{1,8}\\}",
+                  "match": "\\\\u\\{\\h{1,8}}",
                   "name": "constant.character.escape.unicode.cadence"
                 }
               ]
@@ -593,7 +593,7 @@
     "operators": {
       "patterns": [
         {
-          "match": "\\-",
+          "match": "-",
           "name": "keyword.operator.arithmetic.unary.cadence"
         },
         {
@@ -613,7 +613,7 @@
           "name": "keyword.operator.force-move.cadence"
         },
         {
-          "match": "\\+|\\-|\\*|/",
+          "match": "[+\\-*/]",
           "name": "keyword.operator.arithmetic.cadence"
         },
         {
@@ -621,7 +621,7 @@
           "name": "keyword.operator.arithmetic.remainder.cadence"
         },
         {
-          "match": "==|!=|>|<|>=|<=",
+          "match": "==|!=|[><]|>=|<=",
           "name": "keyword.operator.comparison.cadence"
         },
         {

package/grammars/cairo.json

@@ -13,7 +13,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.control.end"
@@ -37,7 +37,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.control.end"
@@ -61,7 +61,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.control.end"
@@ -91,11 +91,11 @@
       "name": "keyword.other.meta"
     },
     {
-      "match": "\\b(SIZEOF_LOCALS|SIZE)\\b",
+      "match": "\\b(SIZE(?:OF_LOCALS|))\\b",
       "name": "markup.italic"
     },
     {
-      "match": "//[^\n]*\n",
+      "match": "//[^\\n]*\\n",
       "name": "comment.line.sharp"
     },
     {
@@ -113,7 +113,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "storage.type.function.cairo"
@@ -137,7 +137,7 @@
         }
       },
       "contentName": "source.cairo0",
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "storage.type.function.cairo"
@@ -151,11 +151,11 @@
       ]
     },
     {
-      "match": "\\b[+-]?[0-9]+\\b",
+      "match": "\\b[+\\-]?[0-9]+\\b",
       "name": "constant.numeric.decimal"
     },
     {
-      "match": "\\b[+-]?0x[0-9a-fA-F]+\\b",
+      "match": "\\b[+\\-]?0x\\h+\\b",
       "name": "constant.numeric.hexadecimal"
     },
     {
@@ -167,7 +167,7 @@
       "name": "string.quoted.double"
     },
     {
-      "begin": "%{",
+      "begin": "%\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.embedded.begin.python"

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"
@@ -93,7 +93,7 @@
               "name": "punctuation.string_type-def.end.clarity"
             }
           },
-          "match": "(\\()\\s*(?:(string-ascii|string-utf8)\\s+(\\d+))\\s*(\\))"
+          "match": "(\\()\\s*(string-(?:ascii|utf8))\\s+(\\d+)\\s*(\\))"
         },
         {
           "captures": {
@@ -191,7 +191,7 @@
               "name": "punctuation.tuple-def.start.clarity"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.tuple-def.end.clarity"
@@ -200,7 +200,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"
             },
             {
@@ -211,7 +211,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"
@@ -237,7 +237,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"
@@ -287,7 +287,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"
@@ -305,7 +305,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"
@@ -352,10 +352,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"
@@ -384,7 +384,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"
@@ -410,7 +410,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"
@@ -449,7 +449,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"
@@ -518,7 +518,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"
@@ -587,7 +587,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"
@@ -725,7 +725,7 @@
           ]
         },
         "principal-literal": {
-          "match": "\\'[0-9A-Z]{28,41}(:?\\.[a-zA-Z][a-zA-Z0-9\\-]+){0,2}|(\\.[a-zA-Z][a-zA-Z0-9\\-]*){1,2}(?=[\\s(){},]|$)",
+          "match": "'[0-9A-Z]{28,41}(:?\\.[a-zA-Z][a-zA-Z0-9\\-]+){0,2}|(\\.[a-zA-Z][a-zA-Z0-9\\-]*){1,2}(?=[\\s(){},]|$)",
           "name": "constant.other.principal.clarity"
         },
         "response-literal": {
@@ -789,7 +789,7 @@
               "name": "punctuation.tuple.start.clarity"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "endCaptures": {
             "1": {
               "name": "punctuation.tuple.end.clarity"
@@ -798,7 +798,7 @@
           "name": "meta.tuple",
           "patterns": [
             {
-              "match": "([a-zA-Z][\\w\\?\\!\\-]*)(?=:)",
+              "match": "([a-zA-Z][\\w?!\\-]*)(?=:)",
               "name": "entity.name.tag.tuple-key.clarity"
             },
             {
@@ -812,7 +812,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"
@@ -838,7 +838,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

@@ -65,7 +65,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "(nil)(?=(\\s|\\)|\\]|\\}))",
+          "match": "(nil)(?=([\\s)\\]}]))",
           "name": "constant.language.nil.clojure"
         },
         {
@@ -77,27 +77,27 @@
           "name": "constant.numeric.symbol.clojure"
         },
         {
-          "match": "([-+]?\\d+/\\d+)",
+          "match": "([\\-+]?\\d+/\\d+)",
           "name": "constant.numeric.ratio.clojure"
         },
         {
-          "match": "([-+]?(?:(?:3[0-6])|(?:[12]\\d)|[2-9])[rR][0-9A-Za-z]+N?)",
+          "match": "([\\-+]?(?:3[0-6]|[12]\\d|[2-9])[rR][0-9A-Za-z]+N?)",
           "name": "constant.numeric.arbitrary-radix.clojure"
         },
         {
-          "match": "([-+]?0[xX][0-9a-fA-F]+N?)",
+          "match": "([\\-+]?0[xX]\\h+N?)",
           "name": "constant.numeric.hexadecimal.clojure"
         },
         {
-          "match": "([-+]?0[0-7]+N?)",
+          "match": "([\\-+]?0[0-7]+N?)",
           "name": "constant.numeric.octal.clojure"
         },
         {
-          "match": "([-+]?[0-9]+(?:(\\.|(?=[eEM]))[0-9]*([eE][-+]?[0-9]+)?)M?)",
+          "match": "([\\-+]?[0-9]+(\\.|(?=[eEM]))[0-9]*([eE][\\-+]?[0-9]+)?M?)",
           "name": "constant.numeric.double.clojure"
         },
         {
-          "match": "([-+]?\\d+N?)",
+          "match": "([\\-+]?\\d+N?)",
           "name": "constant.numeric.long.clojure"
         },
         {
@@ -106,23 +106,23 @@
       ]
     },
     "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"
         },
         {
-          "match": "(?<=(\\s|\\(|\\[|\\{))(declare-?|(in-)?ns|import|use|require|load|compile|(def[\\p{Ll}\\-]*))(?=(\\s|\\)|\\]|\\}))",
+          "match": "(?<=([\\s(\\[{]))(declare-?|(in-)?ns|import|use|require|load|compile|(def[\\p{Ll}\\-]*))(?=([\\s)\\]}]))",
           "name": "keyword.control.clojure"
         }
       ]
     },
     "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,18 +196,18 @@
               "name": "meta.symbol.namespace.clojure"
             }
           },
-          "match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)/"
+          "match": "([\\p{L}.\\-_+=><!?*][\\w.\\-_:+=><!?*\\d]*)/"
         }
       ]
     },
     "quoted-sexp": {
-      "begin": "(['``]\\()",
+      "begin": "(['`]\\()",
       "beginCaptures": {
         "1": {
           "name": "punctuation.section.expression.begin.clojure"
         }
       },
-      "end": "(\\))$|(\\)(?=[\\}\\]\\)\\s]*(?:;|$)))|(\\))",
+      "end": "(\\))$|(\\)(?=[}\\])\\s]*(?:;|$)))|(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.expression.end.trailing.clojure"
@@ -251,13 +251,13 @@
       "name": "constant.character.escape.clojure"
     },
     "set": {
-      "begin": "(\\#\\{)",
+      "begin": "(#\\{)",
       "beginCaptures": {
         "1": {
           "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"
@@ -295,7 +295,7 @@
       "name": "meta.expression.clojure",
       "patterns": [
         {
-          "begin": "(?<=\\()(ns|declare|def[\\w\\d._:+=><!?*-]*|[\\w._:+=><!?*-][\\w\\d._:+=><!?*-]*/def[\\w\\d._:+=><!?*-]*)\\s+",
+          "begin": "(?<=\\()(ns|declare|def[\\w\\d._:+=><!?*\\-]*|[\\w._:+=><!?*\\-][\\w\\d._:+=><!?*\\-]*/def[\\w\\d._:+=><!?*\\-]*)\\s+",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.clojure"
@@ -311,7 +311,7 @@
               "include": "#dynamic-variables"
             },
             {
-              "match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
+              "match": "([\\p{L}.\\-_+=><!?*][\\w.\\-_:+=><!?*\\d]*)",
               "name": "entity.global.clojure"
             },
             {
@@ -343,7 +343,7 @@
               "name": "entity.name.function.clojure"
             }
           },
-          "match": "(?<=\\()(.+?)(?=\\s|\\))",
+          "match": "(?<=\\()(.+?)(?=[\\s)])",
           "patterns": [
             {
               "include": "$self"
@@ -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"

package/grammars/cmake.json

@@ -23,11 +23,11 @@
       "name": "variable.source.cmake"
     },
     {
-      "match": "\\$\\{\\w+\\}",
+      "match": "\\$\\{\\w+}",
       "name": "storage.source.cmake"
     },
     {
-      "match": "\\$ENV\\{\\w+\\}",
+      "match": "\\$ENV\\{\\w+}",
       "name": "storage.source.cmake"
     },
     {
@@ -115,7 +115,7 @@
       "name": "invalid.deprecated.source.cmake"
     },
     {
-      "match": "\\b(?i:(CMAKE_)?(CXX_FLAGS|CMAKE_CXX_FLAGS_DEBUG|CMAKE_CXX_FLAGS_MINSIZEREL|CMAKE_CXX_FLAGS_RELEASE|CMAKE_CXX_FLAGS_RELWITHDEBINFO))\\b",
+      "match": "\\b(?i:(CMAKE_)?(C(?:XX_FLAGS|MAKE_CXX_FLAGS_DEBUG|MAKE_CXX_FLAGS_MINSIZEREL|MAKE_CXX_FLAGS_RELEASE|MAKE_CXX_FLAGS_RELWITHDEBINFO)))\\b",
       "name": "variable.source.cmake"
     }
   ],