shiki - npm Package Compare versions

Comparing version 0.9.12 to 0.9.13

dist/index.d.ts

@@ -259,7 +259,7 @@ import { IRawThemeSetting, IRawGrammar, IRawTheme } from 'vscode-textmate';
 /**
- * Explicitly set the source for loading the OnigasmWASM
+ * Explicitly set the source for loading the oniguruma web assembly module.
  *
  * Accepts Url or ArrayBuffer
  */
-declare function setOnigasmWASM(path: string | ArrayBuffer): void;
+declare function setWasm(path: string | ArrayBuffer): void;
 /**
@@ -270,2 +270,5 @@ * @param themePath related path to theme.json
 
-export { languages as BUNDLED_LANGUAGES, themes as BUNDLED_THEMES, FontStyle, Highlighter, HighlighterOptions, HtmlRendererOptions, ILanguageRegistration, IShikiTheme, IThemeRegistration, IThemedToken, Lang, Theme, getHighlighter, fetchTheme as loadTheme, renderToHtml, setCDN, setOnigasmWASM };
+/** @deprecated use setWasm instead, will be removed in a future version */
+declare function setOnigasmWASM(path: string | ArrayBuffer): void;
+
+export { languages as BUNDLED_LANGUAGES, themes as BUNDLED_THEMES, FontStyle, Highlighter, HighlighterOptions, HtmlRendererOptions, ILanguageRegistration, IShikiTheme, IThemeRegistration, IThemedToken, Lang, Theme, getHighlighter, fetchTheme as loadTheme, renderToHtml, setCDN, setOnigasmWASM, setWasm };

languages/cobol.tmLanguage.json

@@ -68,2 +68,6 @@ {
     {
+      "match": "^[0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s]$",
+      "name": "constant.numeric.cobol"
+    },
+    {
       "match": "(^[0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s][0-9\\s])(\\*.*$)",
@@ -102,2 +106,16 @@ "captures": {
     {
+      "match": "^\\s+([0-9]+)\\s+([0-9a-zA-Z][a-zA-Z\\-0-9_]+)\\s+((?i:constant))",
+      "captures": {
+        "1": {
+          "name": "constant.numeric.cobol"
+        },
+        "2": {
+          "name": "variable.other.constant"
+        },
+        "3": {
+          "name": "keyword.identifers.cobol"
+        }
+      }
+    },
+    {
       "match": "(^[0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@][0-9a-zA-Z\\s\\$#%\\.@])(\\/.*$)",
@@ -118,4 +136,21 @@ "captures": {
     {
-      "match": "(?:^|\\s+)(?i:\\$\\s*set\\s+)(ilusing)(.*)$",
+      "match": "((?:^|\\s+)(?i:\\$set)\\s+)((?i:constant)\\s+)([0-9a-zA-Z][a-zA-Z\\-0-9]+\\s*)([a-zA-Z\\-0-9]*)$",
       "captures": {
+        "1": {
+          "name": "comment.line.set.cobol"
+        },
+        "2": {
+          "name": "keyword.cobol"
+        },
+        "3": {
+          "name": "entity.name.function.cobol"
+        },
+        "4": {
+          "name": "meta.preprocessor.macro.cobol"
+        }
+      }
+    },
+    {
+      "match": "(?:^|\\s+)(?i:\\$\\s*set\\s+)(ilusing)(\\()(.*)(\\))$",
+      "captures": {
         "0": {
@@ -128,3 +163,29 @@ "name": "comment.line.set.cobol"
         "2": {
+          "name": "punctuation.begin.bracket.round.cobol"
+        },
+        "3": {
+          "name": "string.quoted.other.cobol"
+        },
+        "4": {
+          "name": "punctuation.end.bracket.round.cobol"
+        }
+      }
+    },
+    {
+      "match": "(?:^|\\s+)(?i:\\$\\s*set\\s+)(ilusing)(\")(.*)(\")$",
+      "captures": {
+        "0": {
           "name": "comment.line.set.cobol"
+        },
+        "1": {
+          "name": "storage.modifier.import.cobol"
+        },
+        "2": {
+          "name": "punctuation.definition.string.begin.cobol"
+        },
+        "3": {
+          "name": "string.quoted.other.cobol"
+        },
+        "4": {
+          "name": "punctuation.definition.string.begin.cobol"
         }
@@ -148,3 +209,3 @@ }
     {
-      "match": "(?:^|\\s+)(?i:\\$\\s*set\\s|>>cbl\\s)(.*)$",
+      "match": "(?:^|\\s+)(?i:\\$set\\s|>>cbl\\s)(.*)$",
       "captures": {
@@ -268,3 +329,3 @@ "0": {
     {
-      "match": "(?<=(\\(|\\[))((\\-\\+)*[0-9 ,\\.\\+\\-\\*\\/]+)(?=(\\)|\\]))",
+      "match": "(?<=(\\(|\\[))((\\-\\+)*\\s*[0-9 ,\\.\\+\\-\\*\\/]+)(?=(\\)|\\]))",
       "name": "constant.numeric.cobol",
@@ -707,3 +768,3 @@ "captures": {
     {
-      "match": "(?<![-_])(?i:if|else|end-if|exit\\s+iterator|exit\\s+program|exit\\s+method|evaluate|end-evaluate|perform|end-perform|when\\s+other|when|continue|call|end-call|chain|end-chain|invoke|end\\s+invoke|go\\s+to|go|sort|merge|use|xml|parse|stop\\s+run|goback\\s+returning|goback|raise|exit\\s+function|await)(?![0-9A-Za-z_-])",
+      "match": "(?<![-_])(?i:if|else|end-if|exit\\s+iterator|exit\\s+program|exit\\s+method|evaluate|end-evaluate|exit\\s+perform|perform|end-perform|when\\s+other|when|continue|call|end-call|chain|end-chain|invoke|end\\s+invoke|go\\s+to|go|sort|merge|use|xml|parse|stop\\s+run|goback\\s+returning|goback|raise|exit\\s+function|await)(?![0-9A-Za-z_-])",
       "name": "keyword.control.cobol"
@@ -710,0 +771,0 @@ },

languages/dart.tmLanguage.json

@@ -220,10 +220,45 @@ {
         {
-          "name": "support.class.dart",
-          "match": "(?<![a-zA-Z0-9_$])([_$]*[A-Z][a-zA-Z0-9_$]*|bool\\b|num\\b|int\\b|double\\b|dynamic\\b)"
+          "include": "#class-identifier"
         },
         {
-          "match": "([_$]*[a-z][a-zA-Z0-9_$]*)(<|\\(|\\s+=>)",
+          "include": "#function-identifier"
+        }
+      ]
+    },
+    "class-identifier": {
+      "patterns": [
+        {
+          "match": "(?<![a-zA-Z0-9_$])([_$]*[A-Z][a-zA-Z0-9_$]*(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?|bool\\b|num\\b|int\\b|double\\b|dynamic\\b|(void)\\b)",
           "captures": {
             "1": {
+              "name": "support.class.dart"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type-args"
+                }
+              ]
+            },
+            "3": {
+              "name": "storage.type.primitive.dart"
+            }
+          }
+        }
+      ]
+    },
+    "function-identifier": {
+      "patterns": [
+        {
+          "match": "([_$]*[a-z][a-zA-Z0-9_$]*)(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?(\\(|\\s+=>)",
+          "captures": {
+            "1": {
               "name": "entity.name.function.dart"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type-args"
+                }
+              ]
             }
@@ -234,2 +269,28 @@ }
     },
+    "type-args": {
+      "begin": "(<)",
+      "end": "(>)",
+      "beginCaptures": {
+        "1": {
+          "name": "other.source.dart"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "other.source.dart"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#class-identifier"
+        },
+        {
+          "match": "[\\s,]+"
+        },
+        {
+          "name": "keyword.declaration.dart",
+          "match": "extends"
+        }
+      ]
+    },
     "keywords": {
@@ -236,0 +297,0 @@ "patterns": [

languages/latex.tmLanguage.json

@@ -814,3 +814,3 @@ {
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:array|equation|(?:IEEE)?eqnarray|multline|align|aligned|alignat|flalign|flaligned|flalignat|split|gather|gathered|cases|(?:display)?math|[a-zA-Z]*matrix|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?",
+      "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:array|equation|(?:IEEE)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|cases|(?:display)?math|[a-zA-Z]*matrix|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?",
       "captures": {
@@ -891,3 +891,3 @@ "1": {
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|tblr)(\\})(\\s*\\n)?",
+      "begin": "(?:\\s*)((\\\\)begin)(\\{)(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr)(\\})(\\s*\\n)?",
       "captures": {
@@ -894,0 +894,0 @@ "1": {

languages/nginx.tmLanguage.json

 {
-  "fileTypes": ["conf"],
+  "fileTypes": ["conf", "nginx"],
   "foldingStartMarker": "\\{\\s*$",
@@ -141,3 +141,3 @@ "foldingStopMarker": "^\\s*\\}",
     {
-      "match": "\\b(proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_background_update|proxy_cache_bypass|proxy_cache_convert_head|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_age|proxy_cache_lock_timeout|proxy_cache_max_range_offset|proxy_cache_methods|proxy_cache_min_uses|proxy_cache_path|proxy_cache_purge|proxy_cache_revalidate|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_headers_hash_bucket_size|proxy_headers_hash_max_size|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_intercept_errors|proxy_max_temp_file_size|proxy_method|proxy_next_upstream|proxy_next_upstream_tries|proxy_next_upstream_timeout|proxy_pass|proxy_pass_header|proxy_pass_request_body|proxy_pass_request_headers|proxy_read_timeout|proxy_redirect|proxy_redirect_errors|proxy_send_lowat|proxy_send_timeout|proxy_set_body|proxy_set_header|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_t|emp_pathproxy_upstream_fail_timeout|proxy_upstream_max_fails)\\b",
+      "match": "\\b(proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_background_update|proxy_cache_bypass|proxy_cache_convert_head|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_age|proxy_cache_lock_timeout|proxy_cache_max_range_offset|proxy_cache_methods|proxy_cache_min_uses|proxy_cache_path|proxy_cache_purge|proxy_cache_revalidate|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_headers_hash_bucket_size|proxy_headers_hash_max_size|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_intercept_errors|proxy_max_temp_file_size|proxy_method|proxy_next_upstream|proxy_next_upstream_tries|proxy_next_upstream_timeout|proxy_pass|proxy_pass_header|proxy_pass_request_body|proxy_pass_request_headers|proxy_read_timeout|proxy_redirect|proxy_redirect_errors|proxy_send_lowat|proxy_send_timeout|proxy_set_body|proxy_set_header|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_t|emp_pathproxy_upstream_fail_timeout|proxy_upstream_max_fails|proxy_no_cache)\\b",
       "name": "constant.language.module.http.proxy"
@@ -144,0 +144,0 @@ },

languages/powershell.tmLanguage.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "https://github.com/PowerShell/EditorSyntax/commit/c150c15cca30cafd2159e3f53514f93ccf4c5649",
+  "version": "https://github.com/PowerShell/EditorSyntax/commit/742f0b5d4b60f5930c0b47fcc1f646860521296e",
   "name": "powershell",
@@ -194,3 +194,3 @@ "scopeName": "source.powershell",
     {
-      "match": "(?<!\\w|-|\\.)((?i:begin|break|catch|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\\?)(?!\\w)",
+      "match": "(?<!\\w|-|\\.)((?i:begin|break|catch|clean|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\\?)(?!\\w)",
       "name": "keyword.control.powershell"
@@ -197,0 +197,0 @@ },

languages/r.tmLanguage.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "https://github.com/Ikuyadeu/vscode-R/commit/c6a9803fbda262ea68c427a2339bddafed41a9d5",
+  "version": "https://github.com/Ikuyadeu/vscode-R/commit/c9290464add8409f35fcbe47339d4b2ca0e4416c",
   "name": "r",
@@ -463,3 +463,3 @@ "scopeName": "source.r",
         {
-          "begin": "^(#')\\s*",
+          "begin": "^\\s*(#')\\s*",
           "beginCaptures": {
@@ -466,0 +466,0 @@ "1": {

languages/scala.tmLanguage.json

@@ -30,3 +30,3 @@ {
         {
-          "match": "given",
+          "match": "\\b(given)\\b",
           "name": "keyword.other.import.given.scala"
@@ -79,3 +79,3 @@ },
             {
-              "match": "given",
+              "match": "\\b(given)\\b",
               "name": "keyword.other.import.given.scala"
@@ -311,4 +311,4 @@ },
         {
-          "begin": "\\b([A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]+)(\"\"\")",
-          "end": "\"\"\"(?!\")",
+          "begin": "\\b(raw)(\"\"\")",
+          "end": "(\"\"\")(?!\")|\\$\n|(\\$[^\\$\"_{A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}])",
           "beginCaptures": {
@@ -324,5 +324,38 @@ "1": {
             {
+              "match": "\\$[\\$\"]",
+              "name": "constant.character.escape.scala"
+            },
+            {
               "include": "#string-interpolation"
             },
             {
+              "match": ".",
+              "name": "string.quoted.triple.interpolated.scala"
+            }
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala"
+            },
+            "2": {
+              "name": "invalid.illegal.unrecognized-string-escape.scala"
+            }
+          }
+        },
+        {
+          "begin": "\\b((?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?))(\"\"\")",
+          "end": "(\"\"\")(?!\")|\\$\n|(\\$[^\\$\"_{A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}])",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.interpolation.scala"
+            },
+            "2": {
+              "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#string-interpolation"
+            },
+            {
               "match": "\\\\\\\\|\\\\u[0-9A-Fa-f]{4}",
@@ -337,4 +370,7 @@ "name": "constant.character.escape.scala"
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala"
+            },
+            "2": {
+              "name": "invalid.illegal.unrecognized-string-escape.scala"
             }
@@ -369,4 +405,4 @@ }
         {
-          "begin": "\\b([A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}]+)(\")",
-          "end": "\"",
+          "begin": "\\b(raw)(\")",
+          "end": "(\")|\\$\n|(\\$[^\\$\"_{A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}])",
           "beginCaptures": {
@@ -382,5 +418,42 @@ "1": {
             {
+              "match": "\\$[\\$\"]",
+              "name": "constant.character.escape.scala"
+            },
+            {
               "include": "#string-interpolation"
             },
             {
+              "match": ".",
+              "name": "string.quoted.double.interpolated.scala"
+            }
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "string.quoted.double.interpolated.scala punctuation.definition.string.end.scala"
+            },
+            "2": {
+              "name": "invalid.illegal.unrecognized-string-escape.scala"
+            }
+          }
+        },
+        {
+          "begin": "\\b((?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?))(\")",
+          "end": "(\")|\\$\n|(\\$[^\\$\"_{A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}])",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.interpolation.scala"
+            },
+            "2": {
+              "name": "string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala"
+            }
+          },
+          "patterns": [
+            {
+              "match": "\\$[\\$\"]",
+              "name": "constant.character.escape.scala"
+            },
+            {
+              "include": "#string-interpolation"
+            },
+            {
               "match": "\\\\(?:[btnfr\\\\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})",
@@ -399,4 +472,7 @@ "name": "constant.character.escape.scala"
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "string.quoted.double.interpolated.scala punctuation.definition.string.end.scala"
+            },
+            "2": {
+              "name": "invalid.illegal.unrecognized-string-escape.scala"
             }
@@ -410,3 +486,3 @@ }
         {
-          "match": "(?<=\\()\\s*(using)\\s+(?=[\\w\\d\\(\\.\\(\\{'\"])",
+          "match": "(?<=\\()\\s*(using)\\s",
           "captures": {
@@ -428,3 +504,3 @@ "1": {
           "name": "meta.template.expression.scala",
-          "match": "(\\$)([A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][[A-Z\\p{Lt}\\p{Lu}_a-z\\p{Lo}\\p{Nl}\\p{Ll}0-9]]*)",
+          "match": "(\\$)([A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\p{Lo}\\p{Nl}\\p{Ll}0-9]*)",
           "captures": {
@@ -519,2 +595,10 @@ "1": {
         {
+          "match": "^\\s*(end)\\s+(val)(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)",
+          "name": "keyword.declaration.stable.end.scala"
+        },
+        {
+          "match": "^\\s*(end)\\s+(var)(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)",
+          "name": "keyword.declaration.volatile.end.scala"
+        },
+        {
           "match": "^\\s*(end)\\s+(?:(new|extension)|([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?))(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)",
@@ -557,3 +641,3 @@ "captures": {
         {
-          "match": "(!|&&|\\|\\|)",
+          "match": "(?<![!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]|_)(!|&&|\\|\\|)(?![!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}])",
           "name": "keyword.operator.logical.scala"
@@ -838,3 +922,3 @@ },
     "qualifiedClassName": {
-      "match": "(\\b([A-Z][\\w]*))",
+      "match": "(\\b([A-Z][\\w]*)(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)",
       "captures": {
@@ -841,0 +925,0 @@ "1": {

languages/solidity.tmLanguage.json

@@ -358,3 +358,3 @@ {
     "constant-currency": {
-      "match": "\\b(ether|wei|finney|szabo)\\b",
+      "match": "\\b(ether|wei|gwei|finney|szabo)\\b",
       "name": "constant.language.currency"
@@ -361,0 +361,0 @@ },

languages/stylus.tmLanguage.json

@@ -353,2 +353,6 @@ {
         {
+          "match": "(?x) (?<![\\w-])\n--\n(?:[-a-zA-Z_]    | [^\\x00-\\x7F])     # First letter\n(?:[-a-zA-Z0-9_] | [^\\x00-\\x7F]      # Remainder of identifier\n  |\\\\(?:[0-9a-fA-F]{1,6}|.)\n)*",
+          "name": "variable.css"
+        },
+        {
           "include": "#language_keywords"
@@ -1124,2 +1128,6 @@ },
             {
+              "name": "variable.argument.stylus",
+              "match": "(?x)\n--\n(?:[-a-zA-Z_]    | [^\\x00-\\x7F])     # First letter\n(?:[-a-zA-Z0-9_] | [^\\x00-\\x7F]      # Remainder of identifier\n  |\\\\(?:[0-9a-fA-F]{1,6}|.)\n)*"
+            },
+            {
               "match": "\\s*(,)\\s*",
@@ -1126,0 +1134,0 @@ "name": "punctuation.separator.parameter.css"

languages/tasl.tmLanguage.json

@@ -34,3 +34,3 @@ {
     "namespace": {
-      "match": "(?:^\\s*)(namespace\\b)(.*)",
+      "match": "(?:^\\s*)(namespace)\\b(.*)",
       "captures": {
@@ -43,5 +43,2 @@ "1": {
             {
-              "include": "#comment"
-            },
-            {
               "include": "#namespaceURI"
@@ -58,3 +55,3 @@ },
     "type": {
-      "begin": "(?:^\\s*)(type\\b)",
+      "begin": "(?:^\\s*)(type)\\b",
       "beginCaptures": {
@@ -73,3 +70,3 @@ "1": {
     "class": {
-      "begin": "(?:^\\s*)(class\\b)",
+      "begin": "(?:^\\s*)(class)\\b",
       "beginCaptures": {
@@ -83,3 +80,3 @@ "1": {
         {
-          "include": "#term"
+          "include": "#key"
         },
@@ -95,3 +92,3 @@ {
     "edge": {
-      "begin": "(?:^\\s*)(edge\\b)",
+      "begin": "(?:^\\s*)(edge)\\b",
       "beginCaptures": {
@@ -105,3 +102,3 @@ "1": {
         {
-          "include": "#term"
+          "include": "#key"
         },
@@ -153,3 +150,3 @@ {
         {
-          "include": "#variable"
+          "include": "#identifier"
         }
@@ -161,3 +158,3 @@ ]
         {
-          "include": "#term"
+          "include": "#datatype"
         }
@@ -168,3 +165,3 @@ ]
       "match": "<>",
-      "name": "constant.language.tasl.uri"
+      "name": "variable.other.constant"
     },
@@ -192,5 +189,15 @@ "product": {
         {
-          "match": "->",
+          "include": "#component"
+        }
+      ]
+    },
+    "component": {
+      "begin": "->",
+      "end": "$",
+      "beginCaptures": {
+        "0": {
           "name": "punctuation.separator.tasl.component"
-        },
+        }
+      },
+      "patterns": [
         {
@@ -222,5 +229,15 @@ "include": "#expression"
         {
-          "match": "<-",
+          "include": "#option"
+        }
+      ]
+    },
+    "option": {
+      "begin": "<-",
+      "end": "$",
+      "beginCaptures": {
+        "0": {
           "name": "punctuation.separator.tasl.option"
-        },
+        }
+      },
+      "patterns": [
         {
@@ -232,6 +249,6 @@ "include": "#expression"
     "reference": {
-      "match": "(\\*)\\s*(\\S+)",
+      "match": "(\\*)\\s*(.*)",
       "captures": {
         "1": {
-          "name": "keyword.operator"
+          "name": "markup.bold keyword.operator"
         },
@@ -241,3 +258,3 @@ "2": {
             {
-              "include": "#term"
+              "include": "#key"
             }
@@ -248,10 +265,14 @@ ]
     },
-    "variable": {
-      "match": "[a-zA-Z][a-zA-Z0-9]*\\b",
-      "name": "entity.name.type.tasl.variable"
+    "identifier": {
+      "match": "([a-zA-Z][a-zA-Z0-9]*)\\b",
+      "captures": {
+        "1": {
+          "name": "variable"
+        }
+      }
     },
     "optional": {
-      "begin": "(\\?)\\s*",
+      "begin": "\\?",
       "beginCaptures": {
-        "1": {
+        "0": {
           "name": "keyword.operator"
@@ -271,7 +292,15 @@ }
     },
+    "key": {
+      "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})+",
+      "name": "markup.bold entity.name.class"
+    },
+    "datatype": {
+      "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})+",
+      "name": "string.regexp"
+    },
     "term": {
       "match": "[a-zA-Z][a-zA-Z0-9]*:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})+",
-      "name": "entity.name"
+      "name": "entity.other.tasl.key"
     }
   }
 }

package.json

 {
   "name": "shiki",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "description": "shiki",
@@ -34,3 +34,3 @@ "author": "Pine Wu <[e-mail]>",
     "jsonc-parser": "^3.0.0",
-    "onigasm": "^2.2.5",
+    "vscode-oniguruma": "^1.6.1",
     "vscode-textmate": "5.2.0"
@@ -37,0 +37,0 @@ },

README.md

@@ -32,12 +32,12 @@ <p>
 ```html
-<script src='https://unpkg.com/shiki'></script>
+<script src="https://unpkg.com/shiki"></script>
 <script>
-shiki
-  .getHighlighter({
-    theme: 'nord'
-  })
-  .then(highlighter => {
-    const code = highlighter.codeToHtml(`console.log('shiki');`, 'js')
-    document.getElementById('output').innerHTML = code
-  })
+  shiki
+    .getHighlighter({
+      theme: 'nord'
+    })
+    .then(highlighter => {
+      const code = highlighter.codeToHtml(`console.log('shiki');`, 'js')
+      document.getElementById('output').innerHTML = code
+    })
 </script>
@@ -66,3 +66,3 @@ ```
 
-- Shiki uses [Onigasm](https://github.com/NeekSandhu/onigasm) by [@NeekSandhu](https://github.com/NeekSandhu)
+- Shiki uses [vscode-oniguruma](https://github.com/microsoft/vscode-oniguruma)
 - A lot of code is based on [vscode-textmate](https://github.com/Microsoft/vscode-textmate)
@@ -69,0 +69,0 @@

themes/github-dark-dimmed.json

@@ -420,3 +420,3 @@ {
       "settings": {
-        "background": "#78191b",
+        "background": "#5D0F12",
         "foreground": "#ff938a"
@@ -423,0 +423,0 @@ }

themes/one-dark-pro.json

@@ -29,2 +29,11 @@ {
       "foreground": "#d19a66"
+    },
+    "variable:c": {
+      "foreground": "#abb2bf"
+    },
+    "variable:cpp": {
+      "foreground": "#abb2bf"
+    },
+    "variable:cs": {
+      "foreground": "#abb2bf"
     }
@@ -1335,3 +1344,3 @@ },
       "settings": {
-        "foreground": "#e06c75"
+        "foreground": "#abb2bf"
       }
@@ -1839,2 +1848,9 @@ },
     {
+      "name": "c variable readwrite",
+      "scope": "variable.other.readwrite.c",
+      "settings": {
+        "foreground": "#abb2bf"
+      }
+    },
+    {
       "name": "js/ts italic",
@@ -1841,0 +1857,0 @@ "scope": "entity.other.attribute-name.js,entity.other.attribute-name.ts,entity.other.attribute-name.jsx,entity.other.attribute-name.tsx,variable.parameter,variable.language.super",

themes/solarized-dark.json

@@ -331,2 +331,5 @@ {
     "editor.wordHighlightStrongBackground": "#005A6FAA",
+    "editorBracketHighlight.foreground1": "#cdcdcdff",
+    "editorBracketHighlight.foreground2": "#b58900ff",
+    "editorBracketHighlight.foreground3": "#d33682ff",
     "peekViewResult.background": "#00212B",
@@ -333,0 +336,0 @@ "peekViewEditor.background": "#10192c",

themes/solarized-light.json

@@ -306,2 +306,3 @@ {
     "editor.background": "#FDF6E3",
+    "notebook.cellEditorBackground": "#F7F0E0",
     "editorWidget.background": "#EEE8D5",
@@ -308,0 +309,0 @@ "editorCursor.foreground": "#657B83",

themes/vitesse-dark.json

@@ -155,2 +155,8 @@ {
     "editorGutter.deletedBackground": "#cb7676",
+    "editorBracketHighlight.foreground1": "#5eaab5",
+    "editorBracketHighlight.foreground2": "#4d9375",
+    "editorBracketHighlight.foreground3": "#d4976c",
+    "editorBracketHighlight.foreground4": "#db889a",
+    "editorBracketHighlight.foreground5": "#e6cc77",
+    "editorBracketHighlight.foreground6": "#429988",
     "debugToolBar.background": "#121212",
@@ -157,0 +163,0 @@ "editor.stackFrameHighlightBackground": "#a707",

themes/vitesse-light.json

@@ -155,2 +155,8 @@ {
     "editorGutter.deletedBackground": "#ab5959",
+    "editorBracketHighlight.foreground1": "#2993a3",
+    "editorBracketHighlight.foreground2": "#1c6b48",
+    "editorBracketHighlight.foreground3": "#a65e2b",
+    "editorBracketHighlight.foreground4": "#b05a78",
+    "editorBracketHighlight.foreground5": "#bda437",
+    "editorBracketHighlight.foreground6": "#2f8a89",
     "debugToolBar.background": "#ffffff",
@@ -157,0 +163,0 @@ "editor.stackFrameHighlightBackground": "#fffbdd",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

217019

increased by0.08%

Worsened metrics

Total package byte prevSize

7940038

decreased by-0.38%

Number of medium supply chain risk alerts

34

increased by41.67%

Dependency changes

• + Addedvscode-oniguruma@^1.6.1

• + Addedvscode-oniguruma@1.7.0(transitive)

• - Removedonigasm@^2.2.5

• - Removedlru-cache@5.1.1(transitive)

• - Removedonigasm@2.2.5(transitive)

• - Removedyallist@3.1.1(transitive)