tm-grammars 1.24.17 → 1.24.19

package/README.md

@@ -43,9 +43,9 @@ import { grammars } from 'tm-grammars'
 | `blade` |  | [laravel/vs-code-extension](https://github.com/laravel/vs-code-extension/blob/fa52467b5f7393407c9acc9b95d3794f67e266da/syntaxes/blade.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/laravel/vs-code-extension/main/LICENSE.md) |  | `html-derivative` `html` `xml` `sql` `javascript` `json` `css` | 98.91 kB |
 | `bsl` | `1c` | [1c-syntax/vsc-language-1c-bsl](https://github.com/1c-syntax/vsc-language-1c-bsl/blob/2cde5a65a17b82b5363affadf5a620ebb0a026dc/syntaxes/1c.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/1c-syntax/vsc-language-1c-bsl/develop/LICENSE.md) |  | `sdbl` | 32.60 kB |
 | `c` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/bd1abe08c38bb5deccf65610f8f3c03d2338d20d/extensions/cpp/syntaxes/c.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 67.93 kB |
-| `cadence` | `cdc` | [onflow/vscode-cadence](https://github.com/onflow/vscode-cadence/blob/e227d66c0346d2229da8c81a116abefdcda5f443/extension/language/syntaxes/cadence.tmGrammar.json) | [Apache-2.0](https://raw.githubusercontent.com/onflow/vscode-cadence/master/LICENSE) |  |  | 9.87 kB |
+| `cadence` | `cdc` | [onflow/vscode-cadence](https://github.com/onflow/vscode-cadence/blob/bc7e5d3bb613e01789584283d7911cfd6b616dc4/extension/language/syntaxes/cadence.tmGrammar.json) | [Apache-2.0](https://raw.githubusercontent.com/onflow/vscode-cadence/master/LICENSE) |  |  | 22.23 kB |
 | `cairo` |  | [starkware-libs/cairo-lang](https://github.com/starkware-libs/cairo-lang/blob/4ea4fe8e167845a3402ae2ea0a8b6004aad18dd5/src/starkware/cairo/lang/ide/vscode-cairo/syntaxes/cairo.tmLanguage.json) | [Apache-2.0](https://raw.githubusercontent.com/starkware-libs/cairo-lang/master/LICENSE.txt) |  | `python` | 2.66 kB |
-| `clarity` |  | [hirosystems/clarity.tmbundle](https://github.com/hirosystems/clarity.tmbundle/blob/57d06c1522fd93659d213dc192a631650a2acb85/Syntaxes/clarity.JSON-tmLanguage) | [MIT](https://raw.githubusercontent.com/hirosystems/clarity.tmbundle/main/LICENSE) |  |  | 13.46 kB |
+| `clarity` |  | [hirosystems/clarity.tmbundle](https://github.com/hirosystems/clarity.tmbundle/blob/a187c9ccbbfeb91550f138c8d606888a902b7c98/Syntaxes/clarity.JSON-tmLanguage) | [MIT](https://raw.githubusercontent.com/hirosystems/clarity.tmbundle/main/LICENSE) |  |  | 13.47 kB |
 | `clojure` | `clj` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/a1a4c0a63b1ad59e84f54b874744fe35dea9abe1/extensions/clojure/syntaxes/clojure.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 6.02 kB |
 | `cmake` |  | [twxs/vs.language.cmake](https://github.com/twxs/vs.language.cmake/blob/19b1b8fe2d68d72cf294d0c3c22f0a3fc54f8f6f/syntaxes/CMake.tmLanguage) | [MIT](https://raw.githubusercontent.com/twxs/vs.language.cmake/master/LICENSE) |  |  | 9.38 kB |
 | `cobol` |  | [spgennard/vscode_cobol](https://github.com/spgennard/vscode_cobol/blob/28a53ee742017ec60055f2aaaf174aaf62e83c45/syntaxes/COBOL.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/spgennard/vscode_cobol/main/LICENSE) |  | `html` `java` | 37.32 kB |

package/grammars/cadence.json

@@ -5,9 +5,6 @@
     {
       "include": "#comments"
     },
-    {
-      "include": "#expressions"
-    },
     {
       "include": "#declarations"
     },
@@ -17,6 +14,9 @@
     {
       "include": "#code-block"
     },
+    {
+      "include": "#expressions"
+    },
     {
       "include": "#composite"
     },
@@ -135,7 +135,7 @@
                   "name": "punctuation.definition.comment.cadence"
                 }
               },
-              "end": "^",
+              "end": "$",
               "name": "comment.line.triple-slash.documentation.cadence"
             },
             {
@@ -145,7 +145,7 @@
                   "name": "punctuation.definition.comment.cadence"
                 }
               },
-              "end": "^",
+              "end": "$",
               "name": "comment.line.double-slash.documentation.cadence"
             },
             {
@@ -155,7 +155,7 @@
                   "name": "punctuation.definition.comment.cadence"
                 }
               },
-              "end": "^",
+              "end": "$",
               "name": "comment.line.double-slash.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|attachment)(?:\\s+interface)?|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": "(?<=})|(?=\\s*\\Z)",
       "name": "meta.definition.type.composite.cadence",
       "patterns": [
         {
@@ -196,13 +196,13 @@
           "begin": "\\{",
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.type.begin.cadence"
+              "name": "punctuation.section.type.begin.cadence"
             }
           },
           "end": "}",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.type.end.cadence"
+              "name": "punctuation.section.type.end.cadence"
             }
           },
           "name": "meta.definition.type.body.cadence",
@@ -251,6 +251,18 @@
         },
         {
           "include": "#initializer"
+        },
+        {
+          "include": "#prepare-execute"
+        },
+        {
+          "include": "#execute-phase"
+        },
+        {
+          "include": "#pre-post"
+        },
+        {
+          "include": "#transaction"
         }
       ]
     },
@@ -264,7 +276,7 @@
           "name": "entity.name.type.event.cadence"
         }
       },
-      "end": "(?<=\\))|$",
+      "end": "(?<=\\))",
       "name": "meta.definition.type.event.cadence",
       "patterns": [
         {
@@ -275,6 +287,40 @@
         }
       ]
     },
+    "execute-phase": {
+      "begin": "(?<!\\.)\\b(execute)\\b\\s*(?=\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.phase.cadence"
+        }
+      },
+      "end": "(?<=})",
+      "name": "meta.definition.transaction.phase.cadence",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "begin": "\\{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.phase.begin.cadence"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.phase.end.cadence"
+            }
+          },
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        }
+      ]
+    },
     "expression-element-list": {
       "patterns": [
         {
@@ -284,7 +330,7 @@
           "begin": "([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s*(:)",
           "beginCaptures": {
             "1": {
-              "name": "support.function.any-method.cadence"
+              "name": "variable.parameter.function-call.cadence"
             },
             "2": {
               "name": "punctuation.separator.argument-label.cadence"
@@ -313,17 +359,104 @@
         {
           "include": "#comments"
         },
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#language-variables"
+        },
+        {
+          "include": "#function-expression"
+        },
+        {
+          "include": "#path-literals"
+        },
+        {
+          "begin": "(?!\\b(?:if|while|for|return|create|destroy|emit|as)\\b)([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s*(<)(?=[\\&(@\\[_{\\p{Lu}]|auth\\b|\\s*$)",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.cadence"
+            },
+            "2": {
+              "name": "punctuation.definition.type-arguments.begin.cadence"
+            }
+          },
+          "end": "(>)(?!\\s*[<=>])",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.type-arguments.end.cadence"
+            }
+          },
+          "name": "meta.type.arguments.cadence",
+          "patterns": [
+            {
+              "include": "#type"
+            },
+            {
+              "match": ",",
+              "name": "punctuation.separator.type-argument.cadence"
+            }
+          ]
+        },
+        {
+          "begin": "(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.arguments.begin.cadence"
+            }
+          },
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.arguments.end.cadence"
+            }
+          },
+          "name": "meta.group.cadence",
+          "patterns": [
+            {
+              "include": "#expression-element-list"
+            }
+          ]
+        },
+        {
+          "begin": "(?<=\\.)([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s*(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.cadence"
+            },
+            "2": {
+              "name": "punctuation.definition.arguments.begin.cadence"
+            }
+          },
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.arguments.end.cadence"
+            }
+          },
+          "name": "meta.function-call.method.cadence",
+          "patterns": [
+            {
+              "include": "#expression-element-list"
+            }
+          ]
+        },
+        {
+          "match": "(?<=\\.)[_\\p{L}][_\\p{L}\\p{N}\\p{M}]*",
+          "name": "variable.other.member.cadence"
+        },
         {
           "include": "#function-call-expression"
         },
         {
-          "include": "#literals"
+          "match": "(?<!\\.)\\b(?!(?:contract|struct|resource|event|enum|attachment|entitlement|import|fun|let|var|if|else|switch|case|default|while|for|in|break|continue|return|emit|as|create|destroy|attach|to|remove|from|pub|priv|access|all|self|view|auth|transaction|prepare|execute|pre|post|init|true|false|nil|Type|Int|UInt|Int8|Int16|Int32|Int64|Int128|Int256|UInt8|UInt16|UInt32|UInt64|UInt128|UInt256|Word8|Word16|Word32|Word64|Fix64|Fix128|UFix64|UFix128|String|Character|Bool|Address|Void|AnyStruct|AnyResource|Any|Never|mapping|include)\\b)[_\\p{L}][_\\p{L}\\p{N}\\p{M}]*\\b",
+          "name": "variable.other.readwrite.cadence"
         },
         {
-          "include": "#operators"
+          "include": "#literals"
         },
         {
-          "include": "#language-variables"
+          "include": "#operators"
         }
       ]
     },
@@ -337,7 +470,7 @@
           "name": "entity.name.function.cadence"
         }
       },
-      "end": "(?<=})|$",
+      "end": "(?<=})|;|(?=}\\s*$)|$",
       "name": "meta.definition.function.cadence",
       "patterns": [
         {
@@ -374,18 +507,18 @@
     "function-call-expression": {
       "patterns": [
         {
-          "begin": "(?!set|init)([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s*(\\()",
+          "begin": "(?<!\\.)\\b(?!set|init|transaction|prepare|execute|access|auth)([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
-              "name": "support.function.any-method.cadence"
+              "name": "entity.name.function.cadence"
             },
-            "4": {
+            "2": {
               "name": "punctuation.definition.arguments.begin.cadence"
             }
           },
-          "end": "\\)",
+          "end": "(\\))",
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "punctuation.definition.arguments.end.cadence"
             }
           },
@@ -398,6 +531,50 @@
         }
       ]
     },
+    "function-expression": {
+      "begin": "(?<!\\.)\\b(?:(view)\\s+)?(fun)\\b(?=\\s*\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.view.cadence"
+        },
+        "2": {
+          "name": "storage.type.function.cadence"
+        }
+      },
+      "end": "(?<=})|$",
+      "name": "meta.function.expression.cadence",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#parameter-clause"
+        },
+        {
+          "include": "#function-result"
+        },
+        {
+          "begin": "(\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.function.begin.cadence"
+            }
+          },
+          "end": "(})",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.function.end.cadence"
+            }
+          },
+          "name": "meta.definition.function.body.cadence",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        }
+      ]
+    },
     "function-result": {
       "begin": "(?<![-!%\\&*+./<=>^|~])(:)(?![-!%\\&*+./<=>^|~])\\s*",
       "beginCaptures": {
@@ -405,7 +582,7 @@
           "name": "keyword.operator.function-result.cadence"
         }
       },
-      "end": "(?!\\G)(?=[;{])|$",
+      "end": "(?<![\\&<@\\[])(?!\\G)(?=\\s*\\{)|(?=;|(?<!\\{)})|$",
       "name": "meta.function-result.cadence",
       "patterns": [
         {
@@ -453,6 +630,125 @@
     },
     "keywords": {
       "patterns": [
+        {
+          "match": "(?<!\\.)\\bvar\\b",
+          "name": "storage.type.var.cadence"
+        },
+        {
+          "match": "(?<!\\.)\\blet\\b",
+          "name": "storage.type.let.cadence"
+        },
+        {
+          "begin": "(?<!\\.)\\b(entitlement)\\s+(mapping)\\s+([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s*(\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.declaration.entitlement.cadence"
+            },
+            "2": {
+              "name": "keyword.other.mapping.cadence"
+            },
+            "3": {
+              "name": "entity.name.type.entitlement-mapping.cadence"
+            },
+            "4": {
+              "name": "punctuation.definition.type.begin.cadence"
+            }
+          },
+          "end": "(})",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.type.end.cadence"
+            }
+          },
+          "name": "meta.definition.entitlement-mapping.cadence",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "match": "\\binclude\\b",
+              "name": "keyword.other.mapping.include.cadence"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.name.type.entitlement-mapping.cadence"
+                }
+              },
+              "match": "(?<=\\binclude)\\s+([_\\p{L}][._\\p{L}\\p{N}\\p{M}]*)"
+            },
+            {
+              "match": "[_\\p{L}][._\\p{L}\\p{N}\\p{M}]*",
+              "name": "entity.name.type.entitlement.cadence"
+            },
+            {
+              "match": "->",
+              "name": "punctuation.separator.mapping.cadence"
+            }
+          ]
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "keyword.declaration.entitlement.cadence"
+            },
+            "2": {
+              "name": "entity.name.type.entitlement.cadence"
+            }
+          },
+          "match": "(?<!\\.)\\b(entitlement)\\b\\s+([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)"
+        },
+        {
+          "begin": "(?<!\\.)\\b(access)\\b\\s*(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.access.cadence"
+            },
+            "2": {
+              "name": "punctuation.section.group.begin.cadence"
+            }
+          },
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.group.end.cadence"
+            }
+          },
+          "name": "meta.access.modifier.cadence",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "match": "\\bmapping\\b",
+              "name": "keyword.other.mapping.cadence"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.name.type.entitlement-mapping.cadence"
+                }
+              },
+              "match": "(?<=\\bmapping)\\s+([_\\p{L}][._\\p{L}\\p{N}\\p{M}]*)"
+            },
+            {
+              "match": "\\b(?:all|self|contract|account)\\b",
+              "name": "constant.language.access.audience.cadence"
+            },
+            {
+              "match": ",",
+              "name": "punctuation.separator.entitlement.cadence"
+            },
+            {
+              "match": "\\|",
+              "name": "punctuation.separator.entitlement.cadence"
+            },
+            {
+              "match": "[_\\p{L}][._\\p{L}\\p{N}\\p{M}]*",
+              "name": "entity.name.type.entitlement.cadence"
+            }
+          ]
+        },
         {
           "match": "(?<!\\.)\\b(?:if|else|switch|case|default)\\b",
           "name": "keyword.control.branch.cadence"
@@ -466,20 +762,43 @@
           "name": "keyword.control.loop.cadence"
         },
         {
-          "match": "(?<!\\.)\\b(?:pre|post|prepare|execute|create|destroy|emit)\\b",
+          "match": "(?<!\\.)\\b(?:create|destroy|emit|attach|to|remove|from)\\b",
           "name": "keyword.other.cadence"
         },
         {
-          "match": "(?<!\\.)\\b(?:private|pub(?:\\(set\\))?|access\\((?:self|contract|account|all)\\))\\b",
-          "name": "keyword.other.declaration-specifier.accessibility.cadence"
+          "match": "(?<!\\.)\\b(p(?:ub|riv))\\b",
+          "name": "invalid.deprecated.keyword.cadence"
         },
         {
-          "match": "\\b(?:init|destroy)\\b",
-          "name": "storage.type.function.cadence"
+          "match": "(?<!\\.)\\bview\\b",
+          "name": "storage.modifier.view.cadence"
+        },
+        {
+          "match": "(?<!\\.)\\b(auth)\\b",
+          "name": "keyword.other.auth.cadence"
         },
         {
-          "match": "(?<!\\.)\\b(?:import|from)\\b",
-          "name": "keyword.control.import.cadence"
+          "begin": "(?<!\\.)\\b(import)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.import.cadence"
+            }
+          },
+          "end": "(?=$|//|/\\*|;)",
+          "name": "meta.import.cadence",
+          "patterns": [
+            {
+              "match": "\\bfrom\\b",
+              "name": "keyword.control.import.cadence"
+            },
+            {
+              "include": "#literals"
+            },
+            {
+              "match": "\\b[_\\p{L}][_\\p{L}\\p{N}\\p{M}]*\\b",
+              "name": "variable.other.readwrite.cadence"
+            }
+          ]
         }
       ]
     },
@@ -521,10 +840,13 @@
               "include": "#octal"
             },
             {
-              "include": "#decimal"
+              "include": "#hexadecimal"
             },
             {
-              "include": "#hexadecimal"
+              "include": "#fixed-point"
+            },
+            {
+              "include": "#decimal"
             }
           ],
           "repository": {
@@ -536,6 +858,10 @@
               "match": "(\\B-|\\b)[0-9]([0-9_]*[0-9])?\\b",
               "name": "constant.numeric.integer.decimal.cadence"
             },
+            "fixed-point": {
+              "match": "(\\B-|\\b)[0-9]([0-9_]*[0-9])?\\.[0-9]([0-9_]*[0-9])?\\b",
+              "name": "constant.numeric.float.cadence"
+            },
             "hexadecimal": {
               "match": "(\\B-|\\b)0x\\h([_\\h]*\\h)?\\b",
               "name": "constant.numeric.integer.hexadecimal.cadence"
@@ -567,6 +893,46 @@
                   "match": "[\\n\\r]",
                   "name": "invalid.illegal.returns-not-allowed.cadence"
                 },
+                {
+                  "begin": "\\\\\\(",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.section.embedded.begin.cadence meta.embedded.cadence"
+                    }
+                  },
+                  "contentName": "meta.embedded.line.cadence",
+                  "end": "\\)",
+                  "endCaptures": {
+                    "0": {
+                      "name": "punctuation.section.embedded.end.cadence meta.embedded.cadence"
+                    }
+                  },
+                  "name": "meta.interpolation.cadence",
+                  "patterns": [
+                    {
+                      "begin": "\\(",
+                      "beginCaptures": {
+                        "0": {
+                          "name": "punctuation.section.group.begin.cadence"
+                        }
+                      },
+                      "end": "\\)",
+                      "endCaptures": {
+                        "0": {
+                          "name": "punctuation.section.group.end.cadence"
+                        }
+                      },
+                      "patterns": [
+                        {
+                          "include": "#expressions"
+                        }
+                      ]
+                    },
+                    {
+                      "include": "#expressions"
+                    }
+                  ]
+                },
                 {
                   "include": "#string-guts"
                 }
@@ -592,10 +958,68 @@
     },
     "operators": {
       "patterns": [
+        {
+          "match": "<->",
+          "name": "keyword.operator.swap.cadence"
+        },
+        {
+          "match": "\\?\\.",
+          "name": "keyword.operator.optional.chain.cadence"
+        },
+        {
+          "begin": "\\b(as(?:\\?|!?))\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.operator.type.cast.cadence"
+            }
+          },
+          "end": "(?=$|;|//|/\\\\*|\")|(?=[),}])|(?<=>)(?=\\s*\\{(?!\\s*[_\\p{L}][._\\p{L}\\p{N}\\p{M}]*\\s*:))|(?<=[])>?}\\p{L}\\p{N}])(?=\\s*\\{(?!\\s*[_\\p{L}][._\\p{L}\\p{N}\\p{M}]*\\s*:))|(?=\\?\\?)",
+          "name": "meta.type.cast-target.cadence",
+          "patterns": [
+            {
+              "begin": "\\{(?=\\s*[_\\p{L}][._\\p{L}\\p{N}\\p{M}]*\\s*:)",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.type.dictionary.begin.cadence"
+                }
+              },
+              "end": "(})",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.type.dictionary.end.cadence"
+                }
+              },
+              "name": "meta.type.dictionary.cadence",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#type"
+                },
+                {
+                  "match": ":",
+                  "name": "punctuation.separator.type.dictionary.cadence"
+                },
+                {
+                  "match": ",",
+                  "name": "punctuation.separator.type.dictionary.cadence"
+                }
+              ]
+            },
+            {
+              "include": "#type"
+            }
+          ]
+        },
         {
           "match": "-",
           "name": "keyword.operator.arithmetic.unary.cadence"
         },
+        {
+          "match": "(?<=\\))!",
+          "name": "keyword.operator.force-unwrap.cadence"
+        },
         {
           "match": "!",
           "name": "keyword.operator.logical.not.cadence"
@@ -620,6 +1044,14 @@
           "match": "%",
           "name": "keyword.operator.arithmetic.remainder.cadence"
         },
+        {
+          "match": ">>",
+          "name": "keyword.operator.bitwise.shift.cadence"
+        },
+        {
+          "match": "<<",
+          "name": "keyword.operator.bitwise.shift.cadence"
+        },
         {
           "match": "==|!=|[<>]|>=|<=",
           "name": "keyword.operator.comparison.cadence"
@@ -653,6 +1085,9 @@
       },
       "name": "meta.parameter-clause.cadence",
       "patterns": [
+        {
+          "include": "#comments"
+        },
         {
           "include": "#parameter-list"
         }
@@ -660,27 +1095,38 @@
     },
     "parameter-list": {
       "patterns": [
+        {
+          "include": "#comments"
+        },
         {
           "captures": {
             "1": {
-              "name": "entity.name.function.cadence"
+              "name": "keyword.operator.unnamed-parameter.cadence"
             },
             "2": {
-              "name": "variable.parameter.function.cadence"
+              "name": "variable.parameter.cadence"
             }
           },
-          "match": "([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s+([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)(?=\\s*:)"
+          "match": "(_)\\s+([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)(?=\\s*:)"
         },
         {
           "captures": {
             "1": {
-              "name": "variable.parameter.function.cadence"
+              "name": "entity.name.label.cadence"
             },
             "2": {
-              "name": "entity.name.function.cadence"
+              "name": "variable.parameter.cadence"
             }
           },
-          "match": "(([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*))(?=\\s*:)"
+          "match": "([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s+([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)(?=\\s*:)"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "variable.parameter.cadence"
+            }
+          },
+          "match": "([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)(?=\\s*:)"
         },
         {
           "begin": ":\\s*(?!\\s)",
@@ -697,14 +1143,369 @@
         }
       ]
     },
+    "path-literals": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.path.cadence"
+            },
+            "2": {
+              "name": "constant.other.path.cadence"
+            }
+          },
+          "match": "(/)((storage|public)(/[_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)?)"
+        }
+      ]
+    },
+    "pre-post": {
+      "begin": "(?<!\\.)\\b(p(?:re|ost))\\b\\s*(?=\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.phase.cadence"
+        }
+      },
+      "end": "(?<=})",
+      "name": "meta.definition.transaction.phase.cadence",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "begin": "\\{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.phase.begin.cadence"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.phase.end.cadence"
+            }
+          },
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        }
+      ]
+    },
+    "prepare-execute": {
+      "begin": "(?<!\\.)\\b(prepare)\\b\\s*(?=\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.phase.cadence"
+        }
+      },
+      "end": "(?<=})",
+      "name": "meta.definition.transaction.phase.cadence",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#parameter-clause"
+        },
+        {
+          "begin": "\\{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.phase.begin.cadence"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.phase.end.cadence"
+            }
+          },
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        }
+      ]
+    },
+    "transaction": {
+      "begin": "\\b(transaction)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.transaction.cadence"
+        }
+      },
+      "end": "(?<=\\))|(?<=})",
+      "name": "meta.definition.transaction.cadence",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#parameter-clause"
+        },
+        {
+          "begin": "\\{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.transaction.begin.cadence"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.transaction.end.cadence"
+            }
+          },
+          "name": "meta.definition.transaction.body.cadence",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        }
+      ]
+    },
     "type": {
       "patterns": [
+        {
+          "begin": "(?<!\\.)\\b(?:(view)\\s+)?(fun)\\b\\s*(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.view.cadence"
+            },
+            "2": {
+              "name": "storage.type.function.cadence"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.cadence"
+            }
+          },
+          "end": "(?=[]),>}]|$)",
+          "name": "meta.type.function.cadence",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "begin": "\\G",
+              "end": "(\\))",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.parameters.end.cadence"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#type"
+                },
+                {
+                  "match": ",",
+                  "name": "punctuation.separator.parameter.cadence"
+                }
+              ]
+            },
+            {
+              "begin": "(:)",
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.operator.function-result.cadence"
+                }
+              },
+              "end": "(?=[]),>}]|$)",
+              "name": "meta.function-result.cadence",
+              "patterns": [
+                {
+                  "include": "#type"
+                }
+              ]
+            }
+          ]
+        },
         {
           "include": "#comments"
         },
+        {
+          "begin": "(?<!\\.)([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)\\s*(<)",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.type.cadence"
+            },
+            "2": {
+              "name": "punctuation.definition.type-arguments.begin.cadence"
+            }
+          },
+          "end": "(>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.type-arguments.end.cadence"
+            }
+          },
+          "name": "meta.type.arguments.cadence",
+          "patterns": [
+            {
+              "include": "#type"
+            },
+            {
+              "match": ",",
+              "name": "punctuation.separator.type-argument.cadence"
+            }
+          ]
+        },
+        {
+          "begin": "(?<!\\.)\\b(auth)\\b\\s*(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.auth.cadence"
+            },
+            "2": {
+              "name": "punctuation.section.group.begin.cadence"
+            }
+          },
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.group.end.cadence"
+            }
+          },
+          "name": "meta.auth.entitlements.cadence",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "match": "\\bmapping\\b",
+              "name": "keyword.other.mapping.cadence"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "entity.name.type.entitlement-mapping.cadence"
+                }
+              },
+              "match": "(?<=\\bmapping)\\s+([_\\p{L}][._\\p{L}\\p{N}\\p{M}]*)"
+            },
+            {
+              "match": ",",
+              "name": "punctuation.separator.entitlement.cadence"
+            },
+            {
+              "match": "\\|",
+              "name": "punctuation.separator.entitlement.cadence"
+            },
+            {
+              "match": "[_\\p{L}][._\\p{L}\\p{N}\\p{M}]*",
+              "name": "entity.name.type.entitlement.cadence"
+            }
+          ]
+        },
+        {
+          "begin": "\\{(?![^}]*:)(?!.*}\\s*\\()",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.type.intersection.begin.cadence"
+            }
+          },
+          "end": "(})",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.type.intersection.end.cadence"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#type"
+            },
+            {
+              "match": ",",
+              "name": "punctuation.separator.type.intersection.cadence"
+            }
+          ]
+        },
+        {
+          "begin": "\\{(?=\\s*[_\\p{L}][._\\p{L}\\p{N}\\p{M}]*\\s*:)(?!.*}\\s*\\()",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.type.dictionary.begin.cadence"
+            }
+          },
+          "end": "(})",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.type.dictionary.end.cadence"
+            }
+          },
+          "name": "meta.type.dictionary.cadence",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#type"
+            },
+            {
+              "match": ":",
+              "name": "punctuation.separator.type.dictionary.cadence"
+            },
+            {
+              "match": ",",
+              "name": "punctuation.separator.type.dictionary.cadence"
+            }
+          ]
+        },
+        {
+          "begin": "\\[",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.type.array.begin.cadence"
+            }
+          },
+          "end": "(])",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.type.array.end.cadence"
+            }
+          },
+          "name": "meta.type.array.cadence",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.type.reference.cadence"
+            }
+          },
+          "match": "([\\&@])(?=\\s*\\{)"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.type.reference.cadence"
+            },
+            "2": {
+              "name": "entity.name.type.cadence"
+            }
+          },
+          "match": "([\\&@])\\s*([_\\p{L}][._\\p{L}\\p{N}\\p{M}]*)"
+        },
         {
           "match": "([_\\p{L}][_\\p{L}\\p{N}\\p{M}]*)",
-          "name": "storage.type.cadence"
+          "name": "entity.name.type.cadence"
+        },
+        {
+          "match": "[!?]",
+          "name": "keyword.operator.type.optional.cadence"
         }
       ]
     },
@@ -715,13 +1516,30 @@
           "name": "storage.type.$1.cadence"
         },
         "2": {
-          "name": "entity.name.type.$1.cadence"
+          "name": "variable.other.declaration.cadence"
         }
       },
-      "end": "=|<-!??|$",
+      "end": "=|<-!??|;|(?=//)|$",
       "patterns": [
         {
-          "include": "#type"
+          "include": "#comments"
+        },
+        {
+          "begin": ":\\s*(?!\\s)",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.operator.type.annotation.cadence"
+            }
+          },
+          "end": "(?=//|=|<-!??|;|$)",
+          "patterns": [
+            {
+              "include": "#type"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
         }
       ]
     }

package/grammars/clarity.json

@@ -544,7 +544,7 @@
       ]
     },
     "keyword": {
-      "match": "(?<!\\S)(?!-)\\b(?:block-height|burn-block-height|chain-id|contract-caller|is-in-regtest|stacks-block-height|stx-liquid-supply|tenure-height|tx-sender|tx-sponsor?|current-contract|block-time)\\b(?!\\s*-)",
+      "match": "(?<!\\S)(?!-)\\b(?:block-height|burn-block-height|chain-id|contract-caller|is-in-regtest|stacks-block-height|stx-liquid-supply|tenure-height|tx-sender|tx-sponsor?|current-contract|stacks-block-time)\\b(?!\\s*-)",
       "name": "constant.language.clarity"
     },
     "let-func": {

package/index.js

@@ -521,19 +521,19 @@ export const grammars = [
     aliases: [
       'cdc',
     ],
-    byteSize: 10104,
+    byteSize: 22761,
     displayName: 'Cadence',
     funding: [
     ],
-    hash: '-5DoZ6uCQ1jVa4T63q-jVa0yCe3Nt0ysw2TKfoYq5_U',
-    lastUpdate: '2022-07-04T20:41:15Z',
+    hash: 'xKJ-PvQXCJkAlbfK8vpzoWlSoH8iDiJIwaIi45ILUeg',
+    lastUpdate: '2025-10-08T23:24:39Z',
     license: 'Apache-2.0',
     licenseUrl: 'https://raw.githubusercontent.com/onflow/vscode-cadence/master/LICENSE',
     name: 'cadence',
     scopeName: 'source.cadence',
-    sha: 'e227d66c0346d2229da8c81a116abefdcda5f443',
-    source: 'https://github.com/onflow/vscode-cadence/blob/e227d66c0346d2229da8c81a116abefdcda5f443/extension/language/syntaxes/cadence.tmGrammar.json',
-    sourceApi: 'https://api.github.com/repos/onflow/vscode-cadence/contents/extension/language/syntaxes/cadence.tmGrammar.json?ref=e227d66c0346d2229da8c81a116abefdcda5f443',
+    sha: 'bc7e5d3bb613e01789584283d7911cfd6b616dc4',
+    source: 'https://github.com/onflow/vscode-cadence/blob/bc7e5d3bb613e01789584283d7911cfd6b616dc4/extension/language/syntaxes/cadence.tmGrammar.json',
+    sourceApi: 'https://api.github.com/repos/onflow/vscode-cadence/contents/extension/language/syntaxes/cadence.tmGrammar.json?ref=bc7e5d3bb613e01789584283d7911cfd6b616dc4',
   },
   {
     byteSize: 2727,
@@ -557,22 +557,22 @@ export const grammars = [
     sourceApi: 'https://api.github.com/repos/starkware-libs/cairo-lang/contents/src/starkware/cairo/lang/ide/vscode-cairo/syntaxes/cairo.tmLanguage.json?ref=4ea4fe8e167845a3402ae2ea0a8b6004aad18dd5',
   },
   {
-    byteSize: 13782,
+    byteSize: 13789,
     categories: [
       'lisp',
     ],
     displayName: 'Clarity',
     funding: [
     ],
-    hash: 'EIV7nYF1broDJdu7cJQjrtckUiO8F2du4GJVG4ahhtc',
-    lastUpdate: '2025-10-06T16:56:04Z',
+    hash: 'x-e0LcAtKvpExm7uqO0sFoqbgwmPXGlaQn2KuzxQyfw',
+    lastUpdate: '2025-10-09T17:14:05Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/hirosystems/clarity.tmbundle/main/LICENSE',
     name: 'clarity',
     scopeName: 'source.clar',
-    sha: '57d06c1522fd93659d213dc192a631650a2acb85',
-    source: 'https://github.com/hirosystems/clarity.tmbundle/blob/57d06c1522fd93659d213dc192a631650a2acb85/Syntaxes/clarity.JSON-tmLanguage',
-    sourceApi: 'https://api.github.com/repos/hirosystems/clarity.tmbundle/contents/Syntaxes/clarity.JSON-tmLanguage?ref=57d06c1522fd93659d213dc192a631650a2acb85',
+    sha: 'a187c9ccbbfeb91550f138c8d606888a902b7c98',
+    source: 'https://github.com/hirosystems/clarity.tmbundle/blob/a187c9ccbbfeb91550f138c8d606888a902b7c98/Syntaxes/clarity.JSON-tmLanguage',
+    sourceApi: 'https://api.github.com/repos/hirosystems/clarity.tmbundle/contents/Syntaxes/clarity.JSON-tmLanguage?ref=a187c9ccbbfeb91550f138c8d606888a902b7c98',
   },
   {
     aliases: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tm-grammars",
   "type": "module",
-  "version": "1.24.17",
+  "version": "1.24.19",
   "description": "Collecton of TextMate grammars in JSON",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",