tm-grammars 1.26.0 → 1.27.1

package/grammars/gn.json

@@ -0,0 +1,155 @@
+{
+  "displayName": "GN",
+  "name": "gn",
+  "patterns": [
+    {
+      "include": "#expression"
+    }
+  ],
+  "repository": {
+    "boolean": {
+      "match": "\\b(true|false)\\b",
+      "name": "constant.language.boolean.gn"
+    },
+    "builtins": {
+      "patterns": [
+        {
+          "match": "\\b(action|action_foreach|bundle_data|copy|create_bundle|executable|generated_file|group|loadable_module|rust_library|rust_proc_macro|shared_library|source_set|static_library|target)\\b",
+          "name": "support.function.gn"
+        },
+        {
+          "match": "\\b(assert|config|declare_args|defined|exec_script|filter_exclude|filter_include|filter_labels_exclude|filter_labels_include|foreach|forward_variables_from|get_label_info|get_path_info|get_target_outputs|getenv|import|label_matches|not_needed|pool|print|print_stack_trace|process_file_template|read_file|rebase_path|set_default_toolchain|set_defaults|split_list|string_join|string_replace|string_split|template|tool|toolchain|write_file)\\b",
+          "name": "support.function.gn"
+        },
+        {
+          "match": "\\b(current_cpu|current_os|current_toolchain|default_toolchain|gn_version|host_cpu|host_os|invoker|python_path|root_build_dir|root_gen_dir|root_out_dir|target_cpu|target_gen_dir|target_name|target_os|target_out_dir)\\b",
+          "name": "variable.language.gn"
+        },
+        {
+          "match": "\\b(aliased_deps|all_dependent_configs|allow_circular_includes_from|arflags|args|asmflags|assert_no_deps|bridge_header|bundle_contents_dir|bundle_deps_filter|bundle_executable_dir|bundle_resources_dir|bundle_root_dir|cflags|cflags_cc??|cflags_objcc??|check_includes|code_signing_args|code_signing_outputs|code_signing_script|code_signing_sources|complete_static_lib|configs|contents|crate_name|crate_root|crate_type|data|data_deps|data_keys|defines|depfile|deps|externs|framework_dirs|frameworks|friend|gen_deps|include_dirs|inputs|ldflags|lib_dirs|libs|metadata|mnemonic|module_name|output_conversion|output_dir|output_extension|output_name|output_prefix_override|outputs|partial_info_plist|pool|post_processing_args|post_processing_outputs|post_processing_script|post_processing_sources|precompiled_header|precompiled_header_type|precompiled_source|product_type|public|public_configs|public_deps|rebase|response_file_contents|rustflags|script|sources|swiftflags|testonly|transparent|visibility|walk_keys|weak_frameworks|write_runtime_deps|xcasset_compiler_flags|xcode_extra_attributes|xcode_test_application_name)\\b",
+          "name": "variable.language.gn"
+        }
+      ]
+    },
+    "call": {
+      "begin": "\\b([A-Z_a-z][0-9A-Z_a-z]*)\\s*\\(",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.gn"
+        }
+      },
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ]
+    },
+    "comment": {
+      "begin": "#",
+      "end": "$",
+      "name": "comment.line.number-sign.gn"
+    },
+    "expression": {
+      "patterns": [
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#builtins"
+        },
+        {
+          "include": "#call"
+        },
+        {
+          "include": "#literals"
+        },
+        {
+          "include": "#identifier"
+        },
+        {
+          "include": "#operators"
+        },
+        {
+          "include": "#comment"
+        }
+      ]
+    },
+    "identifier": {
+      "match": "\\b[A-Z_a-z][0-9A-Z_a-z]*\\b",
+      "name": "variable.general.gn"
+    },
+    "keywords": {
+      "match": "\\b(if|else)\\b",
+      "name": "keyword.control.if.gn"
+    },
+    "literals": {
+      "patterns": [
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#number"
+        },
+        {
+          "include": "#boolean"
+        }
+      ]
+    },
+    "number": {
+      "match": "\\b-?\\d+\\b",
+      "name": "constant.numeric.gn"
+    },
+    "operators": {
+      "match": "\\b(\\+=??|==|!=|-=??|<=??|[!=>]|>=|&&|\\|\\|\\.)\\b",
+      "name": "keyword.operator.gn"
+    },
+    "string": {
+      "begin": "\"",
+      "end": "\"",
+      "name": "string.quoted.double.gn",
+      "patterns": [
+        {
+          "match": "\\\\[\"$\\\\]",
+          "name": "constant.character.escape.gn"
+        },
+        {
+          "match": "\\$0x\\h\\h",
+          "name": "constant.character.hex.gn"
+        },
+        {
+          "begin": "\\$\\{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.template-expression.begin.gn"
+            }
+          },
+          "contentName": "meta.embedded.substitution.gn",
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.template-expression.end.gn"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.template-expression.begin.gn"
+            },
+            "2": {
+              "name": "meta.embedded.substitution.gn variable.general.gn"
+            }
+          },
+          "match": "(\\$)([A-Z_a-z][0-9A-Z_a-z]*)"
+        }
+      ]
+    }
+  },
+  "scopeName": "source.gn"
+}

package/grammars/go.json

@@ -121,6 +121,9 @@
             {
               "include": "#struct_variables_types"
             },
+            {
+              "include": "#support_functions"
+            },
             {
               "include": "#type-declarations"
             },

package/grammars/kusto.json

@@ -219,7 +219,7 @@
       "name": "storage.type.kusto"
     },
     {
-      "match": "\\b(bool|decimal|dynamic|guid|int|long|real|string)\\b",
+      "match": "\\b(bool|boolean|decimal|dynamic|guid|int|long|real|string)\\b",
       "name": "storage.type.kusto"
     },
     {

package/grammars/latex.json

@@ -74,7 +74,7 @@
     "all-balanced-env": {
       "patterns": [
         {
-          "begin": "\\s*((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE|sub)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|\\+?cases|(?:display)?math|\\+?[A-Za-z]*matrix|[BVbpv]?NiceMatrix|[BVbpv]?NiceArray|(?:arg)?m(?:ini|axi))[!*]?)(})(\\s*\\n)?",
+          "begin": "\\s*((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE|sub)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|(?:[+dr]|dr)?cases|(?:display)?math|\\+?[A-Za-z]*matrix|[BVbpv]?NiceMatrix|[BVbpv]?NiceArray|(?:arg)?m(?:ini|axi))[!*]?)(})(\\s*\\n)?",
           "captures": {
             "1": {
               "name": "support.function.be.latex"
@@ -323,7 +323,7 @@
           },
           "patterns": [
             {
-              "include": "text.tex#braces"
+              "include": "#braces"
             },
             {
               "include": "$self"
@@ -359,7 +359,7 @@
           },
           "patterns": [
             {
-              "include": "text.tex#braces"
+              "include": "#braces"
             },
             {
               "include": "$self"
@@ -437,6 +437,47 @@
         }
       ]
     },
+    "braces": {
+      "begin": "(?<!\\\\)\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.group.begin.latex"
+        }
+      },
+      "end": "(?<!\\\\)}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.group.end.latex"
+        }
+      },
+      "name": "meta.group.braces.latex",
+      "patterns": [
+        {
+          "include": "#text-font-macro"
+        },
+        {
+          "include": "#citation-macro"
+        },
+        {
+          "include": "#references-macro"
+        },
+        {
+          "include": "#label-macro"
+        },
+        {
+          "include": "#macro-with-args-tokenizer"
+        },
+        {
+          "include": "#all-other-macro"
+        },
+        {
+          "include": "text.tex"
+        },
+        {
+          "include": "#braces"
+        }
+      ]
+    },
     "citation-macro": {
       "begin": "((\\\\)(?:[Aa]uto|foot|full|no|ref|short|[Tt]ext|[Pp]aren|[Ss]mart)?[Cc]ite(?:al)?(?:[pst]|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^)]*\\)){0,2}(?:\\[[^]]*]){0,2}\\{[-.:_\\p{Alphabetic}\\p{N}]*})*)(<[^]<>]*>)?((?:\\[[^]]*])*)(\\{)",
       "captures": {
@@ -3680,7 +3721,7 @@
           "include": "#column-specials"
         },
         {
-          "include": "text.tex#braces"
+          "include": "#braces"
         },
         {
           "include": "text.tex"
@@ -3813,7 +3854,7 @@
           "include": "#column-specials"
         },
         {
-          "include": "text.tex#braces"
+          "include": "#braces"
         },
         {
           "include": "text.tex"
@@ -4023,7 +4064,7 @@
       "name": "meta.function.section.$3.latex",
       "patterns": [
         {
-          "include": "text.tex#braces"
+          "include": "#braces"
         },
         {
           "include": "$self"
@@ -4137,7 +4178,7 @@
           "name": "meta.function.emph.latex",
           "patterns": [
             {
-              "include": "text.tex#braces"
+              "include": "#braces"
             },
             {
               "include": "$self"
@@ -4167,7 +4208,7 @@
           "name": "meta.function.textit.latex",
           "patterns": [
             {
-              "include": "text.tex#braces"
+              "include": "#braces"
             },
             {
               "include": "$self"
@@ -4197,7 +4238,7 @@
           "name": "meta.function.textbf.latex",
           "patterns": [
             {
-              "include": "text.tex#braces"
+              "include": "#braces"
             },
             {
               "include": "$self"
@@ -4227,7 +4268,7 @@
           "name": "meta.function.texttt.latex",
           "patterns": [
             {
-              "include": "text.tex#braces"
+              "include": "#braces"
             },
             {
               "include": "$self"

package/grammars/lean.json

@@ -164,10 +164,6 @@
       "match": "(?<![]\\w])'(\\\\(x\\h\\h|u\\h\\h\\h\\h|.))'",
       "name": "string.quoted.single.lean4"
     },
-    {
-      "match": "`+[^(\\[]\\S+",
-      "name": "entity.name.lean4"
-    },
     {
       "match": "\\b([0-9]+|0([Xx]\\h+)|-?(0|[1-9][0-9]*)(\\.[0-9]+)?([Ee][-+]?[0-9]+)?)\\b",
       "name": "constant.numeric.lean4"

package/grammars/lua.json

@@ -25,7 +25,7 @@
               "name": "punctuation.definition.parameters.begin.lua"
             }
           },
-          "end": "(\\))|(?=[-\\]\"'.\\[{}])",
+          "end": "(\\))|(?=[-\\]\"'\\[{}])|(?<!\\.)\\.(?!\\.)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.parameters.finish.lua"
@@ -36,6 +36,17 @@
             {
               "include": "#comment"
             },
+            {
+              "captures": {
+                "1": {
+                  "name": "constant.language.lua"
+                },
+                "2": {
+                  "name": "variable.parameter.function.lua"
+                }
+              },
+              "match": "(\\.{3})\\s*([A-Z_a-z][0-9A-Z_a-z]*)"
+            },
             {
               "match": "[A-Z_a-z][0-9A-Z_a-z]*",
               "name": "variable.parameter.function.lua"
@@ -152,6 +163,14 @@
       "match": "\\b(local)\\b",
       "name": "keyword.local.lua"
     },
+    {
+      "captures": {
+        "1": {
+          "name": "keyword.global.lua"
+        }
+      },
+      "match": "^\\s*(global)\\b(?!\\s*=)"
+    },
     {
       "match": "\\b(function)\\b(?![,:])",
       "name": "keyword.control.lua"
@@ -173,13 +192,17 @@
       "name": "entity.name.tag.lua"
     },
     {
-      "match": "(?<![^.]\\.|:)\\b(coroutine\\.(create|isyieldable|close|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)|table\\.(concat|insert|maxn|move|pack|remove|sort|unpack)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?|tointeger|type)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(loadlib|seeall|searchpath)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|[gs]etuservalue|set[Cc]stacklimit|traceback|upvalueid|upvaluejoin)|bit32\\.(arshift|band|bnot|bor|btest|bxor|extract|replace|lrotate|lshift|rrotate|rshift)|utf8\\.(char|codes|codepoint|len|offset))\\b(?!\\s*=(?!=))",
+      "match": "(?<![^.]\\.|:)\\b(coroutine\\.(create|isyieldable|close|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)|table\\.(concat|create|insert|maxn|move|pack|remove|sort|unpack)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?|tointeger|type)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(loadlib|seeall|searchpath)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|[gs]etuservalue|set[Cc]stacklimit|traceback|upvalueid|upvaluejoin)|bit32\\.(arshift|band|bnot|bor|btest|bxor|extract|replace|lrotate|lshift|rrotate|rshift)|utf8\\.(char|codes|codepoint|len|offset))\\b(?!\\s*=(?!=))",
       "name": "support.function.library.lua"
     },
     {
-      "match": "\\b(and|or|not|\\|\\||&&|!)\\b",
+      "match": "\\b(\\|\\||&&|!)\\b",
       "name": "keyword.operator.lua"
     },
+    {
+      "match": "\\b(and|or|not)\\b",
+      "name": "keyword.operator.logical.lua"
+    },
     {
       "match": "\\b([A-Z_a-z][0-9A-Z_a-z]*)\\b(?=\\s*(?:[\"'({]|\\[\\[))",
       "name": "support.function.any-method.lua"
@@ -766,11 +789,11 @@
           "end": "(?=[#\\s])",
           "patterns": [
             {
-              "match": "[(),:?][\\t ]*",
+              "match": "[](),:<>?\\[][\\t ]*",
               "name": "keyword.operator.lua"
             },
             {
-              "match": "([A-Z_a-z][-\\]*,.0-9<>A-\\[_a-z]*)(?<!,)[\\t ]*(?=\\??:)",
+              "match": "([A-Z_a-z][-*.0-9A-Z_a-z]*)(?<!,)[\\t ]*(?=\\??:)",
               "name": "entity.name.variable.lua"
             },
             {

package/grammars/luau.json

@@ -484,11 +484,11 @@
           "name": "constant.language.luau"
         },
         {
-          "match": "(?<![^.]\\.|:)\\b(bit32\\.(?:arshift|band|bnot|bor|btest|bxor|extract|lrotate|lshift|replace|rrotate|rshift|countlz|countrz|byteswap)|coroutine\\.(?:create|isyieldable|resume|running|status|wrap|yield|close)|debug\\.(?:info|loadmodule|profilebegin|profileend|traceback)|math\\.(?:abs|acos|asin|atan2??|ceil|clamp|cosh??|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|noise|pow|rad|random|randomseed|round|sign|sinh??|sqrt|tanh??)|os\\.(?:clock|date|difftime|time)|string\\.(?:byte|char|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|split|sub|unpack|upper)|table\\.(?:concat|create|find|foreachi??|getn|insert|maxn|move|pack|remove|sort|unpack|clear|freeze|isfrozen|clone)|task\\.(?:spawn|synchronize|desynchronize|wait|defer|delay)|utf8\\.(?:char|codepoint|codes|graphemes|len|nfcnormalize|nfdnormalize|offset)|buffer\\.(?:create|fromstring|tostring|len|readi8|readu8|readi16|readu16|readi32|readu32|readf32|readf64|writei8|writeu8|writei16|writeu16|writei32|writeu32|writef32|writef64|readstring|writestring|copy|fill))\\b",
+          "match": "(?<![^.]\\.|:)\\b(bit32\\.(?:arshift|band|bnot|bor|btest|bxor|extract|lrotate|lshift|replace|rrotate|rshift|countlz|countrz|byteswap)|coroutine\\.(?:create|isyieldable|resume|running|status|wrap|yield|close)|debug\\.(?:info|loadmodule|profilebegin|profileend|traceback)|math\\.(?:abs|acos|asin|atan2??|ceil|clamp|cosh??|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|noise|pow|rad|random|randomseed|round|sign|sinh??|sqrt|tanh??)|os\\.(?:clock|date|difftime|time)|string\\.(?:byte|char|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|split|sub|unpack|upper)|table\\.(?:concat|create|find|foreachi??|getn|insert|maxn|move|pack|remove|sort|unpack|clear|freeze|isfrozen|clone)|task\\.(?:spawn|synchronize|desynchronize|wait|defer|delay)|utf8\\.(?:char|codepoint|codes|graphemes|len|nfcnormalize|nfdnormalize|offset)|buffer\\.(?:create|fromstring|tostring|len|readi8|readu8|readi16|readu16|readi32|readu32|readf32|readf64|writei8|writeu8|writei16|writeu16|writei32|writeu32|writef32|writef64|readstring|writestring|copy|fill)|vector\\.(?:abs|angle|ceil|clamp|create|cross|dot|floor|lerp|magnitude|max|min|normalize|sign))\\b",
           "name": "support.function.luau"
         },
         {
-          "match": "(?<![^.]\\.|:)\\b(bit32|buffer|coroutine|debug|math(\\.(huge|pi))?|os|string|table|task|utf8(\\.charpattern)?)\\b",
+          "match": "(?<![^.]\\.|:)\\b(bit32|buffer|coroutine|debug|math(\\.(huge|pi))?|os|string|table|task|utf8(\\.charpattern)?|vector(\\.(one|zero))?)\\b",
           "name": "support.constant.luau"
         },
         {

package/grammars/markdown-nix.json

@@ -8,11 +8,11 @@
   "name": "markdown-nix",
   "patterns": [
     {
-      "include": "#nixCodeBlock"
+      "include": "#nix-code-block"
     }
   ],
   "repository": {
-    "nixCodeBlock": {
+    "nix-code-block": {
       "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(nix)(\\s+[^`~]*)?$)",
       "beginCaptures": {
         "3": {

package/grammars/markdown-vue.json

@@ -36,7 +36,7 @@
       "name": "markup.fenced_code.block.markdown",
       "patterns": [
         {
-          "include": "source.vue"
+          "include": "text.html.vue"
         }
       ]
     }

package/grammars/marko.json

@@ -942,7 +942,7 @@
       "name": "invalid.illegal.character-not-allowed-here.marko"
     },
     "invalid-close-tag": {
-      "begin": "\\s*</.*?",
+      "begin": "\\s*</[^>]*",
       "end": ">",
       "name": "invalid.illegal.character-not-allowed-here.marko"
     },
@@ -1336,7 +1336,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "end": "/>|(?<=</\\2??>)",
+          "end": "/>|(?<=</>)|(?<=</\\2>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1385,7 +1385,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "end": "/>|(?<=</\\2??>)",
+          "end": "/>|(?<=</>)|(?<=</\\2>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1434,7 +1434,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "end": "/>|(?<=</\\2??>)",
+          "end": "/>|(?<=</>)|(?<=</\\2>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1483,7 +1483,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "end": "/>|(?<=</\\2??>)",
+          "end": "/>|(?<=</>)|(?<=</\\2>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1532,7 +1532,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "end": "/>|(?<=</\\2??>)",
+          "end": "/>|(?<=</>)|(?<=</\\2>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1581,7 +1581,7 @@
               "name": "punctuation.definition.tag.begin.marko"
             }
           },
-          "end": "/>|(?<=</\\2??>)",
+          "end": "/>|(?<=</>)|(?<=</\\2>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1598,7 +1598,7 @@
                   "name": "punctuation.definition.tag.end.marko"
                 }
               },
-              "end": "\\s*(</)([-#$.0-:@-Z_a-z]+)?(.*?)(>)",
+              "end": "\\s*(</)([-#$.0-:@-Z_a-z]+)?([^>]*)(>)",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.tag.begin.marko"

package/grammars/mermaid.json

@@ -458,7 +458,7 @@
               "match": "(?i)^\\s*([-\\w]+)\\s*(\\[)?\\s*([-\\w]+|\"[-\\w\\s]+\")?\\s*(])?$"
             },
             {
-              "begin": "(?i)\\s+([-\\w]+)\\s*(\\[)?\\s*([-\\w]+|\"[-\\w\\s]+\")?\\s*(])?\\s*(\\{)",
+              "begin": "(?i)\\s*([-\\w]+)\\s*(\\[)?\\s*([-\\w]+|\"[-\\w\\s]+\")?\\s*(])?\\s*(\\{)",
               "beginCaptures": {
                 "1": {
                   "name": "variable"
@@ -498,7 +498,7 @@
                       "name": "string"
                     }
                   },
-                  "match": "(?i)\\s*([-\\w]+)\\s+([-\\w]+)\\s+([FPU]K(?:,\\s*[FPU]K){0,2})?\\s*(\"[!-(*-/:-?\\\\^\\w\\s]*\")?\\s*"
+                  "match": "(?i)\\s*([-\\w]+)\\s+([-\\w]+)\\s+([FPU]K(?:,\\s*[FPU]K){0,2})?\\s*(\"[^\\n\\r\"]*\")?\\s*"
                 },
                 {
                   "match": "%%.*",
@@ -1081,6 +1081,70 @@
             }
           ]
         },
+        {
+          "begin": "^\\s*(mindmap)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.mermaid"
+            }
+          },
+          "end": "(^|\\G)(?=\\s*[:`~]{3,}\\s*$)",
+          "patterns": [
+            {
+              "match": "%%.*",
+              "name": "comment"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.control.mermaid"
+                },
+                "2": {
+                  "name": "string"
+                }
+              },
+              "match": "(?i)(\\s*:::)(\\s*[!-$\\&'*-/;-?\\\\^\\w\\s]*)"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "keyword.control.mermaid"
+                },
+                "2": {
+                  "name": "punctuation.parenthesis.open.mermaid"
+                },
+                "3": {
+                  "name": "string"
+                },
+                "4": {
+                  "name": "punctuation.parenthesis.close.mermaid"
+                }
+              },
+              "match": "(?i)(\\s*::icon)(\\s*\\()(\\s*[!-$\\&'*-/;-?\\\\^\\w\\s]*)(\\s*\\))"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "variable"
+                },
+                "2": {
+                  "name": "keyword.control.mermaid"
+                },
+                "3": {
+                  "name": "string"
+                },
+                "4": {
+                  "name": "keyword.control.mermaid"
+                }
+              },
+              "match": "(?i)(\\s*[!-$\\&'*-/:-?\\\\^\\w\\s]*)(\\s*\\({1,2}|\\){1,2}|\\{\\{|\\[)(\\s*[!-$\\&'*-/:-?\\\\^\\w\\s]*)(\\s*\\){1,2}|\\({1,2}|}}|])"
+            },
+            {
+              "match": "^(\\s*[!-$\\&'*-/:-?\\\\^\\w\\s]*)",
+              "name": "string"
+            }
+          ]
+        },
         {
           "begin": "^\\s*(pie)",
           "beginCaptures": {
@@ -2001,7 +2065,7 @@
       ]
     },
     "mermaid-code-block": {
-      "begin": "(?i)(?<=[`~])mermaid(\\s+[^`~]*)?$",
+      "begin": "(?i)(?<=[`~])\\s*mermaid(\\s+[^`~]*)?$",
       "contentName": "meta.embedded.block.mermaid",
       "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
       "patterns": [
@@ -2011,7 +2075,7 @@
       ]
     },
     "mermaid-code-block-with-attributes": {
-      "begin": "(?i)(?<=[`~])\\{\\s*\\.?mermaid(\\s+[^`~]*)?$",
+      "begin": "(?i)(?<=[`~])\\s*\\{\\s*\\.?mermaid(\\s+[^`~]*)?$",
       "contentName": "meta.embedded.block.mermaid",
       "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
       "patterns": [

package/grammars/mojo.json

@@ -3592,7 +3592,7 @@
               "name": "variable.other.python"
             }
           },
-          "match": "\\b(var|let|alias) \\s*([_[:alpha:]]\\w*)\\b"
+          "match": "\\b(var|let|alias|comptime) \\s*([_[:alpha:]]\\w*)\\b"
         }
       ]
     },