shiki - npm Package Compare versions

Comparing version 0.9.5 to 0.9.6

dist/index.d.ts

 import { IRawThemeSetting, IRawGrammar, IRawTheme } from 'vscode-textmate';
 
-declare type Theme = 'dark-plus' | 'github-dark' | 'github-light' | 'light-plus' | 'material-darker' | 'material-default' | 'material-lighter' | 'material-ocean' | 'material-palenight' | 'min-dark' | 'min-light' | 'monokai' | 'nord' | 'poimandres' | 'slack-dark' | 'slack-ochin' | 'solarized-dark' | 'solarized-light';
+declare type Theme = 'dark-plus' | 'dracula-soft' | 'dracula' | 'github-dark' | 'github-light' | 'light-plus' | 'material-darker' | 'material-default' | 'material-lighter' | 'material-ocean' | 'material-palenight' | 'min-dark' | 'min-light' | 'monokai' | 'nord' | 'poimandres' | 'slack-dark' | 'slack-ochin' | 'solarized-dark' | 'solarized-light' | 'vitesse-dark' | 'vitesse-light';
 declare const themes: Theme[];
@@ -235,3 +235,3 @@
 
-declare type Lang = 'abap' | 'actionscript-3' | 'ada' | 'apache' | 'apex' | 'apl' | 'applescript' | 'asm' | 'awk' | 'bat' | 'batch' | 'c' | 'clojure' | 'clj' | 'cobol' | 'coffee' | 'cpp' | 'crystal' | 'csharp' | 'c#' | 'css' | 'd' | 'dart' | 'diff' | 'docker' | 'elixir' | 'elm' | 'erb' | 'erlang' | 'fsharp' | 'f#' | 'gherkin' | 'git-commit' | 'git-rebase' | 'gnuplot' | 'go' | 'graphql' | 'groovy' | 'hack' | 'haml' | 'handlebars' | 'hbs' | 'haskell' | 'hcl' | 'hlsl' | 'html' | 'ini' | 'java' | 'javascript' | 'js' | 'jinja-html' | 'json' | 'jsonc' | 'jsonnet' | 'jsx' | 'julia' | 'kotlin' | 'latex' | 'less' | 'lisp' | 'logo' | 'lua' | 'make' | 'makefile' | 'markdown' | 'md' | 'matlab' | 'mdx' | 'nginx' | 'nim' | 'nix' | 'objective-c' | 'objc' | 'objective-cpp' | 'ocaml' | 'pascal' | 'perl' | 'php' | 'plsql' | 'postcss' | 'powershell' | 'ps' | 'ps1' | 'prolog' | 'pug' | 'jade' | 'puppet' | 'purescript' | 'python' | 'py' | 'r' | 'raku' | 'perl6' | 'razor' | 'riscv' | 'ruby' | 'rb' | 'rust' | 'sas' | 'sass' | 'scala' | 'scheme' | 'scss' | 'shaderlab' | 'shader' | 'shellscript' | 'shell' | 'bash' | 'sh' | 'zsh' | 'smalltalk' | 'solidity' | 'sparql' | 'sql' | 'ssh-config' | 'stylus' | 'styl' | 'svelte' | 'swift' | 'system-verilog' | 'tcl' | 'tex' | 'toml' | 'tsx' | 'turtle' | 'twig' | 'typescript' | 'ts' | 'vb' | 'cmd' | 'verilog' | 'vhdl' | 'viml' | 'vue' | 'wasm' | 'wenyan' | '文言' | 'xml' | 'xsl' | 'yaml';
+declare type Lang = 'abap' | 'actionscript-3' | 'ada' | 'apache' | 'apex' | 'apl' | 'applescript' | 'asm' | 'awk' | 'bat' | 'batch' | 'c' | 'clojure' | 'clj' | 'cobol' | 'coffee' | 'cpp' | 'crystal' | 'csharp' | 'c#' | 'css' | 'd' | 'dart' | 'diff' | 'docker' | 'dream-maker' | 'elixir' | 'elm' | 'erb' | 'erlang' | 'fsharp' | 'f#' | 'gherkin' | 'git-commit' | 'git-rebase' | 'gnuplot' | 'go' | 'graphql' | 'groovy' | 'hack' | 'haml' | 'handlebars' | 'hbs' | 'haskell' | 'hcl' | 'hlsl' | 'html' | 'ini' | 'java' | 'javascript' | 'js' | 'jinja-html' | 'json' | 'jsonc' | 'jsonnet' | 'jssm' | 'fsl' | 'jsx' | 'julia' | 'kotlin' | 'latex' | 'less' | 'lisp' | 'logo' | 'lua' | 'make' | 'makefile' | 'markdown' | 'md' | 'matlab' | 'mdx' | 'nginx' | 'nim' | 'nix' | 'objective-c' | 'objc' | 'objective-cpp' | 'ocaml' | 'pascal' | 'perl' | 'php' | 'plsql' | 'postcss' | 'powershell' | 'ps' | 'ps1' | 'prisma' | 'prolog' | 'pug' | 'jade' | 'puppet' | 'purescript' | 'python' | 'py' | 'r' | 'raku' | 'perl6' | 'razor' | 'riscv' | 'ruby' | 'rb' | 'rust' | 'sas' | 'sass' | 'scala' | 'scheme' | 'scss' | 'shaderlab' | 'shader' | 'shellscript' | 'shell' | 'bash' | 'sh' | 'zsh' | 'smalltalk' | 'solidity' | 'sparql' | 'sql' | 'ssh-config' | 'stylus' | 'styl' | 'svelte' | 'swift' | 'system-verilog' | 'tcl' | 'tex' | 'toml' | 'tsx' | 'turtle' | 'twig' | 'typescript' | 'ts' | 'vb' | 'cmd' | 'verilog' | 'vhdl' | 'viml' | 'vue' | 'wasm' | 'wenyan' | '文言' | 'xml' | 'xsl' | 'yaml';
 declare const languages: ILanguageRegistration[];
@@ -238,0 +238,0 @@

languages/dart.tmLanguage.json

@@ -323,9 +323,6 @@ {
         {
-          "match": "\\$(([a-zA-Z0-9_]+)|\\{([^{}]+)\\})",
+          "match": "\\$([a-zA-Z0-9_]+)",
           "captures": {
-            "2": {
+            "1": {
               "name": "variable.parameter.dart"
-            },
-            "3": {
-              "name": "variable.parameter.dart"
             }
@@ -335,2 +332,20 @@ }
         {
+          "name": "string.interpolated.expression.dart",
+          "begin": "\\$\\{",
+          "end": "\\}",
+          "patterns": [
+            {
+              "include": "#constants-and-special-vars",
+              "name": "variable.parameter.dart"
+            },
+            {
+              "include": "#strings"
+            },
+            {
+              "name": "variable.parameter.dart",
+              "match": "[a-zA-Z0-9_]+"
+            }
+          ]
+        },
+        {
           "name": "constant.character.escape.dart",
@@ -337,0 +352,0 @@ "match": "\\\\."

languages/erlang.tmLanguage.json

 {
   "comment": "The recognition of function definitions and compiler directives (such as module, record and macro definitions) requires that each of the aforementioned constructs must be the first string inside a line (except for whitespace).  Also, the function/module/record/macro names must be given unquoted.  -- desp",
-  "fileTypes": ["erl", "hrl"],
+  "fileTypes": ["erl", "escript", "hrl", "xrl", "yrl"],
   "keyEquivalent": "^~E",
@@ -62,3 +62,3 @@ "name": "erlang",
               },
-              "match": "(\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_]|[0-7]{1,3})",
+              "match": "(\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_a-z]|[0-7]{1,3}|x[\\da-fA-F]{2})",
               "name": "constant.other.symbol.escape.erlang"
@@ -153,3 +153,3 @@ },
           },
-          "match": "(\\$)((\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_]|[0-7]{1,3}))",
+          "match": "(\\$)((\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_a-z]|[0-7]{1,3}|x[\\da-fA-F]{2}))",
           "name": "constant.character.erlang"
@@ -167,3 +167,3 @@ },
           },
-          "match": "(\\$)\\S",
+          "match": "(\\$)[ \\S]",
           "name": "constant.character.erlang"
@@ -201,3 +201,3 @@ },
         {
-          "begin": "^\\s*+(-)\\s*+(define)\\s*+(\\()\\s*+([a-zA-Z\\d@_]++)\\s*+(,)",
+          "begin": "^\\s*+(-)\\s*+(define)\\s*+(\\()\\s*+([a-zA-Z\\d@_]++)\\s*+",
           "beginCaptures": {
@@ -215,5 +215,2 @@ "1": {
               "name": "entity.name.function.macro.definition.erlang"
-            },
-            "5": {
-              "name": "punctuation.separator.parameters.erlang"
             }
@@ -368,2 +365,5 @@ },
         {
+          "include": "#language-constant"
+        },
+        {
           "include": "#function-call"
@@ -479,2 +479,31 @@ },
             },
+            "4": {
+              "name": "entity.name.type.class.module.erlang"
+            },
+            "5": {
+              "name": "variable.other.erlang"
+            },
+            "6": {
+              "name": "punctuation.separator.module-function.erlang"
+            },
+            "8": {
+              "name": "entity.name.function.erlang"
+            },
+            "9": {
+              "name": "variable.other.erlang"
+            },
+            "10": {
+              "name": "punctuation.separator.function-arity.erlang"
+            }
+          },
+          "comment": "Implicit function expression with optional module qualifier when both module and function can be atom or variable",
+          "match": "\\b(fun)\\s+((([a-z][a-zA-Z\\d@_]*+)|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(:)\\s*+)?(([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*(/)",
+          "name": "meta.expression.fun.implicit.erlang"
+        },
+        {
+          "begin": "\\b(fun)\\s+(([a-z][a-zA-Z\\d@_]*+)|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(:)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.fun.erlang"
+            },
             "3": {
@@ -484,12 +513,65 @@ "name": "entity.name.type.class.module.erlang"
             "4": {
-              "name": "punctuation.separator.module-function.erlang"
+              "name": "variable.other.erlang"
             },
             "5": {
+              "name": "punctuation.separator.module-function.erlang"
+            }
+          },
+          "comment": "Implicit function expression with module qualifier when module can be atom or variable and function can by anything",
+          "end": "(/)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.function-arity.erlang"
+            }
+          },
+          "name": "meta.expression.fun.implicit.erlang",
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(fun)\\s+(?!\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.fun.erlang"
+            }
+          },
+          "comment": "Implicit function expression when both module and function can by anything",
+          "end": "(/)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.function-arity.erlang"
+            }
+          },
+          "name": "meta.expression.fun.implicit.erlang",
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(fun)\\s*+(\\()(?=(\\s*+\\())",
+          "beginCaptures": {
+            "1": {
               "name": "entity.name.function.erlang"
             },
-            "6": {
-              "name": "punctuation.separator.function-arity.erlang"
+            "2": {
+              "name": "punctuation.definition.parameters.begin.erlang"
             }
           },
-          "match": "\\b(fun)\\s+(([a-z][a-zA-Z\\d@_]*+)\\s*+(:)\\s*+)?([a-z][a-zA-Z\\d@_]*+)\\s*(/)"
+          "comment": "Function type in type specification",
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
         },
@@ -503,2 +585,3 @@ {
           },
+          "comment": "Explicit function expression",
           "end": "\\b(end)\\b",
@@ -576,22 +659,2 @@ "endCaptures": {
           ]
-        },
-        {
-          "begin": "\\b(query)\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.query.erlang"
-            }
-          },
-          "end": "\\b(end)\\b",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.control.end.erlang"
-            }
-          },
-          "name": "meta.expression.query.erlang",
-          "patterns": [
-            {
-              "include": "#everything-else"
-            }
-          ]
         }
@@ -646,3 +709,3 @@ ]
     "function-call": {
-      "begin": "(?=([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(\\(|:\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+\\())",
+      "begin": "(?=([a-z][a-zA-Z\\d@_]*+|'[^']*+'|_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+)\\s*+(\\(|:\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+'|_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+)\\s*+\\())",
       "end": "(\\))",
@@ -684,14 +747,20 @@ "endCaptures": {
         {
-          "begin": "(([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(:)\\s*+)?([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(\\()",
+          "begin": "((([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(:)\\s*+)?(([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(\\()",
           "beginCaptures": {
-            "2": {
+            "3": {
               "name": "entity.name.type.class.module.erlang"
             },
-            "3": {
+            "4": {
+              "name": "variable.other.erlang"
+            },
+            "5": {
               "name": "punctuation.separator.module-function.erlang"
             },
-            "4": {
+            "7": {
               "name": "entity.name.function.erlang"
             },
-            "5": {
+            "8": {
+              "name": "variable.other.erlang"
+            },
+            "9": {
               "name": "punctuation.definition.parameters.begin.erlang"
@@ -896,7 +965,12 @@ }
       },
-      "end": "(?=\\})",
+      "end": "(\\})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.class.record.end.erlang"
+        }
+      },
       "name": "meta.structure.record.erlang",
       "patterns": [
         {
-          "begin": "(([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_))\\s*+(=|::)",
+          "begin": "(([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_))",
           "beginCaptures": {
@@ -908,5 +982,2 @@ "2": {
               "name": "variable.language.omitted.field.erlang"
-            },
-            "4": {
-              "name": "keyword.operator.assignment.erlang"
             }
@@ -927,13 +998,2 @@ },
         {
-          "captures": {
-            "1": {
-              "name": "variable.other.field.erlang"
-            },
-            "2": {
-              "name": "punctuation.separator.class.record.erlang"
-            }
-          },
-          "match": "([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(,)?"
-        },
-        {
           "include": "#everything-else"
@@ -967,6 +1027,12 @@ }
             "5": {
+              "name": "punctuation.separator.unit-specifiers.erlang"
+            },
+            "6": {
+              "name": "constant.numeric.integer.decimal.erlang"
+            },
+            "7": {
               "name": "punctuation.separator.type-specifiers.erlang"
             }
           },
-          "match": "(integer|float|binary|bytes|bitstring|bits)|(signed|unsigned)|(big|little|native)|(unit)|(-)"
+          "match": "(integer|float|binary|bytes|bitstring|bits|utf8|utf16|utf32)|(signed|unsigned)|(big|little|native)|(unit)(:)(\\d++)|(-)"
         }
@@ -976,5 +1042,9 @@ ]
     "keyword": {
-      "match": "\\b(after|begin|case|catch|cond|end|fun|if|let|of|query|try|receive|when)\\b",
+      "match": "\\b(after|begin|case|catch|cond|end|fun|if|let|of|try|receive|when)\\b",
       "name": "keyword.control.erlang"
     },
+    "language-constant": {
+      "match": "\\b(false|true|undefined)\\b",
+      "name": "constant.language"
+    },
     "list": {
@@ -1138,3 +1208,3 @@ "begin": "(\\[)",
           },
-          "match": "2(#)[0-1]++",
+          "match": "2(#)([0-1]++_)*[0-1]++",
           "name": "constant.numeric.integer.binary.erlang"
@@ -1148,3 +1218,3 @@ },
           },
-          "match": "3(#)[0-2]++",
+          "match": "3(#)([0-2]++_)*[0-2]++",
           "name": "constant.numeric.integer.base-3.erlang"
@@ -1158,3 +1228,3 @@ },
           },
-          "match": "4(#)[0-3]++",
+          "match": "4(#)([0-3]++_)*[0-3]++",
           "name": "constant.numeric.integer.base-4.erlang"
@@ -1168,3 +1238,3 @@ },
           },
-          "match": "5(#)[0-4]++",
+          "match": "5(#)([0-4]++_)*[0-4]++",
           "name": "constant.numeric.integer.base-5.erlang"
@@ -1178,3 +1248,3 @@ },
           },
-          "match": "6(#)[0-5]++",
+          "match": "6(#)([0-5]++_)*[0-5]++",
           "name": "constant.numeric.integer.base-6.erlang"
@@ -1188,3 +1258,3 @@ },
           },
-          "match": "7(#)[0-6]++",
+          "match": "7(#)([0-6]++_)*[0-6]++",
           "name": "constant.numeric.integer.base-7.erlang"
@@ -1198,3 +1268,3 @@ },
           },
-          "match": "8(#)[0-7]++",
+          "match": "8(#)([0-7]++_)*[0-7]++",
           "name": "constant.numeric.integer.octal.erlang"
@@ -1208,3 +1278,3 @@ },
           },
-          "match": "9(#)[0-8]++",
+          "match": "9(#)([0-8]++_)*[0-8]++",
           "name": "constant.numeric.integer.base-9.erlang"
@@ -1218,3 +1288,3 @@ },
           },
-          "match": "10(#)\\d++",
+          "match": "10(#)(\\d++_)*\\d++",
           "name": "constant.numeric.integer.decimal.erlang"
@@ -1228,3 +1298,3 @@ },
           },
-          "match": "11(#)[\\daA]++",
+          "match": "11(#)([\\daA]++_)*[\\daA]++",
           "name": "constant.numeric.integer.base-11.erlang"
@@ -1238,3 +1308,3 @@ },
           },
-          "match": "12(#)[\\da-bA-B]++",
+          "match": "12(#)([\\da-bA-B]++_)*[\\da-bA-B]++",
           "name": "constant.numeric.integer.base-12.erlang"
@@ -1248,3 +1318,3 @@ },
           },
-          "match": "13(#)[\\da-cA-C]++",
+          "match": "13(#)([\\da-cA-C]++_)*[\\da-cA-C]++",
           "name": "constant.numeric.integer.base-13.erlang"
@@ -1258,3 +1328,3 @@ },
           },
-          "match": "14(#)[\\da-dA-D]++",
+          "match": "14(#)([\\da-dA-D]++_)*[\\da-dA-D]++",
           "name": "constant.numeric.integer.base-14.erlang"
@@ -1268,3 +1338,3 @@ },
           },
-          "match": "15(#)[\\da-eA-E]++",
+          "match": "15(#)([\\da-eA-E]++_)*[\\da-eA-E]++",
           "name": "constant.numeric.integer.base-15.erlang"
@@ -1278,3 +1348,3 @@ },
           },
-          "match": "16(#)[0-9A-Fa-f]++",
+          "match": "16(#)([\\da-fA-F]++_)*[\\da-fA-F]++",
           "name": "constant.numeric.integer.hexadecimal.erlang"
@@ -1288,3 +1358,3 @@ },
           },
-          "match": "17(#)[\\da-gA-G]++",
+          "match": "17(#)([\\da-gA-G]++_)*[\\da-gA-G]++",
           "name": "constant.numeric.integer.base-17.erlang"
@@ -1298,3 +1368,3 @@ },
           },
-          "match": "18(#)[\\da-hA-H]++",
+          "match": "18(#)([\\da-hA-H]++_)*[\\da-hA-H]++",
           "name": "constant.numeric.integer.base-18.erlang"
@@ -1308,3 +1378,3 @@ },
           },
-          "match": "19(#)[\\da-iA-I]++",
+          "match": "19(#)([\\da-iA-I]++_)*[\\da-iA-I]++",
           "name": "constant.numeric.integer.base-19.erlang"
@@ -1318,3 +1388,3 @@ },
           },
-          "match": "20(#)[\\da-jA-J]++",
+          "match": "20(#)([\\da-jA-J]++_)*[\\da-jA-J]++",
           "name": "constant.numeric.integer.base-20.erlang"
@@ -1328,3 +1398,3 @@ },
           },
-          "match": "21(#)[\\da-kA-K]++",
+          "match": "21(#)([\\da-kA-K]++_)*[\\da-kA-K]++",
           "name": "constant.numeric.integer.base-21.erlang"
@@ -1338,3 +1408,3 @@ },
           },
-          "match": "22(#)[\\da-lA-L]++",
+          "match": "22(#)([\\da-lA-L]++_)*[\\da-lA-L]++",
           "name": "constant.numeric.integer.base-22.erlang"
@@ -1348,3 +1418,3 @@ },
           },
-          "match": "23(#)[\\da-mA-M]++",
+          "match": "23(#)([\\da-mA-M]++_)*[\\da-mA-M]++",
           "name": "constant.numeric.integer.base-23.erlang"
@@ -1358,3 +1428,3 @@ },
           },
-          "match": "24(#)[\\da-nA-N]++",
+          "match": "24(#)([\\da-nA-N]++_)*[\\da-nA-N]++",
           "name": "constant.numeric.integer.base-24.erlang"
@@ -1368,3 +1438,3 @@ },
           },
-          "match": "25(#)[\\da-oA-O]++",
+          "match": "25(#)([\\da-oA-O]++_)*[\\da-oA-O]++",
           "name": "constant.numeric.integer.base-25.erlang"
@@ -1378,3 +1448,3 @@ },
           },
-          "match": "26(#)[\\da-pA-P]++",
+          "match": "26(#)([\\da-pA-P]++_)*[\\da-pA-P]++",
           "name": "constant.numeric.integer.base-26.erlang"
@@ -1388,3 +1458,3 @@ },
           },
-          "match": "27(#)[\\da-qA-Q]++",
+          "match": "27(#)([\\da-qA-Q]++_)*[\\da-qA-Q]++",
           "name": "constant.numeric.integer.base-27.erlang"
@@ -1398,3 +1468,3 @@ },
           },
-          "match": "28(#)[\\da-rA-R]++",
+          "match": "28(#)([\\da-rA-R]++_)*[\\da-rA-R]++",
           "name": "constant.numeric.integer.base-28.erlang"
@@ -1408,3 +1478,3 @@ },
           },
-          "match": "29(#)[\\da-sA-S]++",
+          "match": "29(#)([\\da-sA-S]++_)*[\\da-sA-S]++",
           "name": "constant.numeric.integer.base-29.erlang"
@@ -1418,3 +1488,3 @@ },
           },
-          "match": "30(#)[\\da-tA-T]++",
+          "match": "30(#)([\\da-tA-T]++_)*[\\da-tA-T]++",
           "name": "constant.numeric.integer.base-30.erlang"
@@ -1428,3 +1498,3 @@ },
           },
-          "match": "31(#)[\\da-uA-U]++",
+          "match": "31(#)([\\da-uA-U]++_)*[\\da-uA-U]++",
           "name": "constant.numeric.integer.base-31.erlang"
@@ -1438,3 +1508,3 @@ },
           },
-          "match": "32(#)[\\da-vA-V]++",
+          "match": "32(#)([\\da-vA-V]++_)*[\\da-vA-V]++",
           "name": "constant.numeric.integer.base-32.erlang"
@@ -1448,3 +1518,3 @@ },
           },
-          "match": "33(#)[\\da-wA-W]++",
+          "match": "33(#)([\\da-wA-W]++_)*[\\da-wA-W]++",
           "name": "constant.numeric.integer.base-33.erlang"
@@ -1458,3 +1528,3 @@ },
           },
-          "match": "34(#)[\\da-xA-X]++",
+          "match": "34(#)([\\da-xA-X]++_)*[\\da-xA-X]++",
           "name": "constant.numeric.integer.base-34.erlang"
@@ -1468,3 +1538,3 @@ },
           },
-          "match": "35(#)[\\da-yA-Y]++",
+          "match": "35(#)([\\da-yA-Y]++_)*[\\da-yA-Y]++",
           "name": "constant.numeric.integer.base-35.erlang"
@@ -1478,11 +1548,11 @@ },
           },
-          "match": "36(#)[\\da-zA-Z]++",
+          "match": "36(#)([\\da-zA-Z]++_)*[\\da-zA-Z]++",
           "name": "constant.numeric.integer.base-36.erlang"
         },
         {
-          "match": "\\d++#[\\da-zA-Z]++",
+          "match": "\\d++#([\\da-zA-Z]++_)*[\\da-zA-Z]++",
           "name": "invalid.illegal.integer.erlang"
         },
         {
-          "match": "\\d++",
+          "match": "(\\d++_)*\\d++",
           "name": "constant.numeric.integer.decimal.erlang"
@@ -1531,14 +1601,8 @@ }
       },
-      "end": "((\\}))\\s*+(\\))\\s*+(\\.)",
+      "end": "(\\))\\s*+(\\.)",
       "endCaptures": {
         "1": {
-          "name": "meta.structure.record.erlang"
+          "name": "punctuation.definition.parameters.end.erlang"
         },
         "2": {
-          "name": "punctuation.definition.class.record.end.erlang"
-        },
-        "3": {
-          "name": "punctuation.definition.parameters.end.erlang"
-        },
-        "4": {
           "name": "punctuation.section.directive.end.erlang"
@@ -1551,2 +1615,5 @@ }
           "include": "#internal-record-body"
+        },
+        {
+          "include": "#comment"
         }
@@ -1585,11 +1652,3 @@ ]
           },
-          "end": "((\\}))",
-          "endCaptures": {
-            "1": {
-              "name": "meta.structure.record.erlang"
-            },
-            "2": {
-              "name": "punctuation.definition.class.record.end.erlang"
-            }
-          },
+          "end": "(?<=\\})",
           "name": "meta.record-usage.erlang",
@@ -1628,3 +1687,3 @@ "patterns": [
           },
-          "match": "(\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_]|[0-7]{1,3})",
+          "match": "(\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_a-z]|[0-7]{1,3}|x[\\da-fA-F]{2})",
           "name": "constant.character.escape.erlang"
@@ -1631,0 +1690,0 @@ },

languages/julia.tmLanguage.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/008e02c5ec9440fa9f0ea8a891712c7238f24706",
+  "version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/63325eb9959b57282e2804e5d7215d240a9a6fd6",
   "name": "julia",
@@ -261,3 +261,3 @@ "scopeName": "source.julia",
         {
-          "match": "(?<!(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿]))((\\b0(x|X)[0-9a-fA-F](_?[0-9a-fA-F])*)|(\\b0o[0-7](_?[0-7])*)|(\\b0b[0-1](_?[0-1])*)|((\\b[0-9](_?[0-9])*\\.?(_?[0-9]*))|(\\.[0-9](_?[0-9])*))([efE][+-]?[0-9](_?[0-9])*)?(im\\b)?|\\bInf(16|32|64)?\\b|\\bNaN(16|32|64)?\\b|\\bπ\\b|\\bpi\\b|\\bℯ\\b)",
+          "match": "(?<!(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿]))((\\b0(x|X)[0-9a-fA-F](_?[0-9a-fA-F])*)|(\\b0o[0-7](_?[0-7])*)|(\\b0b[0-1](_?[0-1])*)|((\\b[0-9](_?[0-9])*\\.?(?!\\.)([_0-9]*))|(\\.[0-9](_?[0-9])*))([efE][+-]?[0-9](_?[0-9])*)?(im\\b)?|\\bInf(16|32|64)?\\b|\\bNaN(16|32|64)?\\b|\\bπ\\b|\\bpi\\b|\\bℯ\\b)",
           "name": "constant.numeric.julia"
@@ -264,0 +264,0 @@ },

languages/latex.tmLanguage.json

@@ -111,2 +111,36 @@ {
     {
+      "name": "meta.function.environment.songs.latex",
+      "begin": "((?:\\s*)\\\\begin\\{songs\\}\\{.*\\})",
+      "end": "(\\\\end\\{songs\\}(?:\\s*\\n)?)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#env-mandatory-arg"
+            }
+          ]
+        }
+      },
+      "contentName": "meta.data.environment.songs.latex",
+      "patterns": [
+        {
+          "name": "meta.chord.block.latex support.class.chord.block.environment.latex",
+          "begin": "\\\\\\[",
+          "end": "\\]",
+          "patterns": [
+            {
+              "include": "$base"
+            }
+          ]
+        },
+        {
+          "name": "meta.chord.block.latex support.class.chord.block.environment.latex",
+          "match": "\\^"
+        },
+        {
+          "include": "$self"
+        }
+      ]
+    },
+    {
       "begin": "(^\\s*)?(?=\\\\begin\\{(lstlisting|minted|pyglist)\\})",
@@ -605,3 +639,3 @@ "beginCaptures": {
     {
-      "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:fboxv|boxedv|V|v)erbatim\\*?)(\\})",
+      "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:fboxv|boxedv|V|v|spv)erbatim\\*?)(\\})",
       "captures": {
@@ -1292,2 +1326,13 @@ "1": {
         {
+          "captures": {
+            "1": {
+              "name": "comment.line.percentage.tex"
+            },
+            "2": {
+              "name": "punctuation.definition.comment.tex"
+            }
+          },
+          "match": "((%).*)$"
+        },
+        {
           "match": "[\\w:.]+",
@@ -1356,3 +1401,3 @@ "name": "constant.other.reference.citation.latex"
     {
-      "begin": "((\\\\)[vV]erb[\\*]?)\\s*((\\\\)scantokens)(\\{)",
+      "begin": "((\\\\)(?:verb|Verb|spverb)\\*?)\\s*((\\\\)scantokens)(\\{)",
       "beginCaptures": {
@@ -1407,3 +1452,3 @@ "1": {
       },
-      "match": "((\\\\)[vV]erb[\\*]?)\\s*((?<=\\s)\\S|[^a-zA-Z])(.*?)(\\3|$)",
+      "match": "((\\\\)(?:verb|Verb|spverb)\\*?)\\s*((?<=\\s)\\S|[^a-zA-Z])(.*?)(\\3|$)",
       "name": "meta.function.verb.latex"
@@ -1410,0 +1455,0 @@ },

languages/pascal.tmLanguage.json

 {
-  "fileTypes": ["pas", "p", "pp", "dfm", "dpr", "dpk", "lfm", "lpr"],
+  "fileTypes": ["pas", "p", "pp", "dfm", "fmx", "dpr", "dpk", "lfm", "lpr"],
   "keyEquivalent": "^~P",
@@ -7,3 +7,3 @@ "name": "pascal",
     {
-      "match": "\\b(?i:(absolute|abstract|all|and_then|array|as|asm|attribute|begin|bindable|case|class|const|contains|default|div|else|end|except|export|exports|external|far|file|finalization|finally|forward|generic|goto|if|implements|import|in|index|inherited|initialization|interrupt|is|label|library|mod|module|name|near|not|object|of|on|only|operator|or_else|otherwise|override|package|packed|pow|private|program|protected|public|published|interface|implementation|qualified|read|record|resident|requires|resourcestring|restricted|segment|set|shl|shr|specialize|stored|then|threadvar|to|try|type|unit|uses|var|view|virtual|dynamic|overload|reintroduce|with|write|xor))\\b",
+      "match": "\\b(?i:(absolute|abstract|all|and_then|array|as|asm|attribute|begin|bindable|case|class|const|contains|default|div|else|end|except|export|exports|external|far|file|finalization|finally|forward|generic|goto|if|implements|import|in|index|inherited|initialization|interrupt|is|label|library|mod|module|name|near|not|object|of|on|only|operator|or_else|otherwise|override|package|packed|pow|private|program|protected|public|published|interface|implementation|qualified|read|record|resident|requires|resourcestring|restricted|segment|set|shl|shr|specialize|stored|strict|then|threadvar|to|try|type|unit|uses|var|view|virtual|dynamic|overload|reintroduce|with|write|xor))\\b",
       "name": "keyword.pascal"
@@ -10,0 +10,0 @@ },

languages/r.tmLanguage.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "https://github.com/Ikuyadeu/vscode-R/commit/866d7cbe0620d28948a89bca24d99efd6b74b9bb",
+  "version": "https://github.com/Ikuyadeu/vscode-R/commit/f98bd30417c203876969408440f656f56eba80d8",
   "name": "r",
@@ -114,3 +114,3 @@ "scopeName": "source.r",
         {
-          "match": "\\b(?:[0-9]+\\.?[0-9]*)L\\b",
+          "match": "\\b(?:[0-9]+\\.?[0-9]*)(?:(e|E)(\\+|-)?[0-9]+)?L\\b",
           "name": "constant.numeric.integer.decimal.r"
@@ -117,0 +117,0 @@ },

languages/solidity.tmLanguage.json

@@ -15,2 +15,5 @@ {
     {
+      "include": "#global"
+    },
+    {
       "include": "#control"
@@ -22,14 +25,11 @@ },
     {
-      "include": "#number"
+      "include": "#primitive"
     },
     {
-      "include": "#string"
+      "include": "#type-primitive"
     },
     {
-      "include": "#type"
+      "include": "#type-modifier-extended-scope"
     },
     {
-      "include": "#global"
-    },
-    {
       "include": "#declaration"
@@ -53,3 +53,3 @@ },
           "end": "\\*/",
-          "name": "comment.block.documentation.solidity",
+          "name": "comment.block.documentation",
           "patterns": [
@@ -64,3 +64,3 @@ {
           "end": "$",
-          "name": "comment.block.documentation.solidity",
+          "name": "comment.block.documentation",
           "patterns": [
@@ -77,2 +77,5 @@ {
         {
+          "include": "#comment-todo"
+        },
+        {
           "include": "#natspec-tag-title"
@@ -138,5 +141,15 @@ },
     },
+    "comment-todo": {
+      "match": "(?i)\\b(FIXME|TODO|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG|QUESTION|COMBAK|TEMP|SUPPRESS|LINT|\\w+-disable|\\w+-suppress)\\b(?-i)",
+      "name": "keyword.comment.todo"
+    },
     "comment-line": {
-      "match": "(?<!tp:)//.*?$",
-      "name": "comment.line.solidity"
+      "begin": "(?<!tp:)//",
+      "end": "$",
+      "name": "comment.line",
+      "patterns": [
+        {
+          "include": "#comment-todo"
+        }
+      ]
     },
@@ -146,3 +159,8 @@ "comment-block": {
       "end": "\\*/",
-      "name": "comment.block.solidity"
+      "name": "comment.block",
+      "patterns": [
+        {
+          "include": "#comment-todo"
+        }
+      ]
     },
@@ -170,19 +188,19 @@ "operator": {
       "match": "(==|<(?!<)|<=|>(?!>)|>=|\\&\\&|\\|\\||\\:(?!=)|\\?)",
-      "name": "keyword.operator.logic.solidity"
+      "name": "keyword.operator.logic"
     },
     "operator-mapping": {
       "match": "(=>)",
-      "name": "keyword.operator.mapping.solidity"
+      "name": "keyword.operator.mapping"
     },
     "operator-arithmetic": {
       "match": "(\\+|\\-|\\/|\\*)",
-      "name": "keyword.operator.arithmetic.solidity"
+      "name": "keyword.operator.arithmetic"
     },
     "operator-binary": {
       "match": "(\\^|\\&|\\||<<|>>)",
-      "name": "keyword.operator.binary.solidity"
+      "name": "keyword.operator.binary"
     },
     "operator-assignment": {
       "match": "(\\:?=)",
-      "name": "keyword.operator.assignment.solidity"
+      "name": "keyword.operator.assignment"
     },
@@ -215,16 +233,90 @@ "control": {
     "control-flow": {
-      "match": "\\b(if|else|for|while|do|break|continue|try|catch|finally|throw|returns?)\\b",
-      "name": "keyword.control.flow.solidity"
+      "patterns": [
+        {
+          "match": "\\b(if|else|for|while|do|break|continue|try|catch|finally|throw|return)\\b",
+          "name": "keyword.control.flow"
+        },
+        {
+          "begin": "\\b(returns)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.flow.return"
+            }
+          },
+          "end": "(?=\\))",
+          "patterns": [
+            {
+              "include": "#declaration-function-parameters"
+            }
+          ]
+        }
+      ]
     },
     "control-using": {
-      "match": "\\b(using)\\b",
-      "name": "keyword.control.using.solidity"
+      "patterns": [
+        {
+          "match": "\\b(using)\\b\\s+\\b([A-Za-z\\d_]+)\\b\\s+\\b(for)\\b\\s+\\b([A-Za-z\\d_]+)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.using"
+            },
+            "2": {
+              "name": "entity.name.type.library"
+            },
+            "3": {
+              "name": "keyword.control.for"
+            },
+            "4": {
+              "name": "entity.name.type"
+            }
+          }
+        },
+        {
+          "match": "\\b(using)\\b",
+          "name": "keyword.control.using"
+        }
+      ]
     },
     "control-import": {
-      "match": "\\b(import)\\b",
-      "name": "keyword.control.import.solidity"
+      "patterns": [
+        {
+          "begin": "\\b(import)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.import"
+            }
+          },
+          "end": "(?=\\;)",
+          "patterns": [
+            {
+              "begin": "((?=\\{))",
+              "end": "((?=\\}))",
+              "patterns": [
+                {
+                  "match": "\\b(\\w+)\\b",
+                  "name": "entity.name.type.interface"
+                }
+              ]
+            },
+            {
+              "match": "\\b(from)\\b",
+              "name": "keyword.control.import.from"
+            },
+            {
+              "include": "#string"
+            },
+            {
+              "include": "#punctuation"
+            }
+          ]
+        },
+        {
+          "match": "\\b(import)\\b",
+          "name": "keyword.control.import"
+        }
+      ]
     },
     "control-unchecked": {
       "match": "\\b(unchecked)\\b",
-      "name": "keyword.control.unchecked.solidity"
+      "name": "keyword.control.unchecked"
     },
@@ -235,9 +327,9 @@ "control-pragma": {
         "1": {
-          "name": "keyword.control.pragma.solidity"
+          "name": "keyword.control.pragma"
         },
         "2": {
-          "name": "entity.name.tag.pragma.solidity"
+          "name": "entity.name.tag.pragma"
         },
         "3": {
-          "name": "constant.other.pragma.solidity"
+          "name": "constant.other.pragma"
         }
@@ -248,7 +340,7 @@ }
       "match": "\\b(_)\\b",
-      "name": "constant.other.underscore.solidity"
+      "name": "constant.other.underscore"
     },
     "control-other": {
       "match": "\\b(new|delete|emit)\\b",
-      "name": "keyword.control.solidity"
+      "name": "keyword.control"
     },
@@ -270,11 +362,11 @@ "constant": {
       "match": "\\b(true|false)\\b",
-      "name": "constant.language.boolean.solidity"
+      "name": "constant.language.boolean"
     },
     "constant-time": {
       "match": "\\b(seconds|minutes|hours|days|weeks|years)\\b",
-      "name": "constant.language.time.solidity"
+      "name": "constant.language.time"
     },
     "constant-currency": {
       "match": "\\b(ether|wei|finney|szabo)\\b",
-      "name": "constant.language.currency.solidity"
+      "name": "constant.language.currency"
     },
@@ -288,2 +380,5 @@ "number": {
           "include": "#number-hex"
+        },
+        {
+          "include": "#number-scientific"
         }
@@ -293,9 +388,13 @@ ]
     "number-decimal": {
-      "match": "\\b(\\d+(\\.\\d+)?)\\b",
-      "name": "constant.numeric.decimal.solidity"
+      "match": "\\b([0-9_]+(\\.[0-9_]+)?)\\b",
+      "name": "constant.numeric.decimal"
     },
     "number-hex": {
       "match": "\\b(0[xX][a-fA-F0-9]+)\\b",
-      "name": "constant.numeric.hexadecimal.solidity"
+      "name": "constant.numeric.hexadecimal"
     },
+    "number-scientific": {
+      "match": "\\b(?:0\\.(?:0[1-9]|[1-9][0-9_]?)|[1-9][0-9_]*(?:\\.\\d{1,2})?)(?:e[+-]?[0-9_]+)?",
+      "name": "constant.numeric.scientific"
+    },
     "string": {
@@ -305,14 +404,23 @@ "patterns": [
           "match": "\\\".*?\\\"",
-          "name": "string.quoted.double.solidity"
+          "name": "string.quoted.double"
         },
         {
           "match": "\\'.*?\\'",
-          "name": "string.quoted.single.solidity"
+          "name": "string.quoted.single"
         }
       ]
     },
-    "type": {
+    "primitive": {
       "patterns": [
         {
-          "include": "#type-primitive"
+          "include": "#number-decimal"
+        },
+        {
+          "include": "#number-hex"
+        },
+        {
+          "include": "#number-scientific"
+        },
+        {
+          "include": "#string"
         }
@@ -322,4 +430,31 @@ ]
     "type-primitive": {
-      "match": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool|hash\\d*)\\b",
-      "name": "support.type.primitive.solidity"
+      "patterns": [
+        {
+          "begin": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool|hash\\d*)\\b(?:\\[\\])(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "support.type.primitive"
+            }
+          },
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#primitive"
+            },
+            {
+              "include": "#punctuation"
+            },
+            {
+              "include": "#global"
+            },
+            {
+              "include": "#variable"
+            }
+          ]
+        },
+        {
+          "match": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool|hash\\d*)\\b",
+          "name": "support.type.primitive"
+        }
+      ]
     },
@@ -339,12 +474,20 @@ "global": {
         {
-          "match": "\\b(msg|block|tx|now)\\b",
-          "name": "variable.language.transaction.solidity"
+          "match": "\\b(this)\\b",
+          "name": "variable.language.this"
         },
         {
-          "match": "\\b(this)\\b",
-          "name": "variable.language.this.solidity"
+          "match": "\\b(super)\\b",
+          "name": "variable.language.super"
         },
         {
-          "match": "\\b(super)\\b",
-          "name": "variable.language.super.solidity"
+          "match": "\\b(abi)\\b",
+          "name": "variable.language.builtin.abi"
+        },
+        {
+          "match": "\\b(msg\\.sender|msg|block|tx|now)\\b",
+          "name": "variable.language.transaction"
+        },
+        {
+          "match": "\\b(tx\\.origin|tx\\.gasprice|msg\\.data|msg\\.sig|msg\\.value)\\b",
+          "name": "variable.language.transaction"
         }
@@ -357,18 +500,85 @@ ]
           "match": "\\b(require|assert|revert)\\b",
-          "name": "keyword.control.exceptions.solidity"
+          "name": "keyword.control.exceptions"
         },
         {
           "match": "\\b(selfdestruct|suicide)\\b",
-          "name": "keyword.control.contract.solidity"
+          "name": "keyword.control.contract"
         },
         {
-          "match": "\\b(addmod|mulmod|keccak256|sha256|sha3|ripemd160|ecrecover|unicode)\\b",
-          "name": "support.function.math.solidity"
+          "match": "\\b(addmod|mulmod|keccak256|sha256|sha3|ripemd160|ecrecover)\\b",
+          "name": "support.function.math"
         },
         {
+          "match": "\\b(unicode)\\b",
+          "name": "support.function.string"
+        },
+        {
           "match": "\\b(blockhash|gasleft)\\b",
-          "name": "variable.language.transaction.solidity"
+          "name": "variable.language.transaction"
+        },
+        {
+          "match": "\\b(type)\\b",
+          "name": "variable.language.type"
         }
       ]
     },
+    "type-modifier-access": {
+      "match": "\\b(internal|external|private|public)\\b",
+      "name": "storage.type.modifier.access"
+    },
+    "type-modifier-payable": {
+      "match": "\\b(nonpayable|payable)\\b",
+      "name": "storage.type.modifier.payable"
+    },
+    "type-modifier-constant": {
+      "match": "\\b(constant)\\b",
+      "name": "storage.type.modifier.readonly"
+    },
+    "type-modifier-immutable": {
+      "match": "\\b(immutable)\\b",
+      "name": "storage.type.modifier.readonly"
+    },
+    "type-modifier-extended-scope": {
+      "match": "\\b(pure|view|inherited|indexed|storage|memory|virtual|calldata|override|abstract)\\b",
+      "name": "storage.type.modifier.extendedscope"
+    },
+    "variable": {
+      "patterns": [
+        {
+          "match": "\\b(\\_\\w+)\\b",
+          "captures": {
+            "1": {
+              "name": "variable.parameter.function"
+            }
+          }
+        },
+        {
+          "match": "(?:\\.)(\\w+)\\b",
+          "captures": {
+            "1": {
+              "name": "support.variable.property"
+            }
+          }
+        },
+        {
+          "match": "\\b(\\w+)\\b",
+          "captures": {
+            "1": {
+              "name": "variable.parameter.other"
+            }
+          }
+        }
+      ]
+    },
+    "modifier-call": {
+      "patterns": [
+        {
+          "include": "#function-call"
+        },
+        {
+          "match": "\\b(\\w+)\\b",
+          "name": "entity.name.function.modifier"
+        }
+      ]
+    },
     "declaration": {
@@ -386,37 +596,87 @@ "patterns": [
         {
-          "include": "#declaration-struct"
+          "include": "#declaration-function"
         },
         {
+          "include": "#declaration-modifier"
+        },
+        {
+          "include": "#declaration-constructor"
+        },
+        {
           "include": "#declaration-event"
         },
         {
+          "include": "#declaration-storage"
+        },
+        {
           "include": "#declaration-error"
+        }
+      ]
+    },
+    "declaration-storage-field": {
+      "patterns": [
+        {
+          "include": "#comment"
         },
         {
-          "include": "#declaration-enum"
+          "include": "#control"
         },
         {
-          "include": "#declaration-function"
+          "include": "#type-primitive"
         },
         {
-          "include": "#declaration-constructor"
+          "include": "#type-modifier-access"
         },
         {
-          "include": "#declaration-modifier"
+          "include": "#type-modifier-immutable"
         },
         {
-          "include": "#declaration-mapping"
+          "include": "#type-modifier-extend-scope"
+        },
+        {
+          "include": "#type-modifier-payable"
+        },
+        {
+          "include": "#type-modifier-constant"
+        },
+        {
+          "include": "#primitive"
+        },
+        {
+          "include": "#constant"
+        },
+        {
+          "include": "#operator"
+        },
+        {
+          "include": "#punctuation"
         }
       ]
     },
+    "declaration-storage": {
+      "patterns": [
+        {
+          "include": "#declaration-storage-mapping"
+        },
+        {
+          "include": "#declaration-struct"
+        },
+        {
+          "include": "#declaration-enum"
+        },
+        {
+          "include": "#declaration-storage-field"
+        }
+      ]
+    },
     "declaration-contract": {
       "patterns": [
         {
-          "match": "\\b(contract)(\\s+([A-Za-z_]\\w*))?\\b",
+          "match": "\\b(contract)\\b\\s+(\\w+)\\b\\s*(?=\\{)",
           "captures": {
             "1": {
-              "name": "storage.type.contract.solidity"
+              "name": "storage.type.contract"
             },
-            "3": {
-              "name": "entity.name.type.contract.solidity"
+            "2": {
+              "name": "entity.name.type.contract"
             }
@@ -426,4 +686,21 @@ }
         {
-          "match": "\\b(is)\\b",
-          "name": "storage.modifier.is.solidity"
+          "begin": "\\b(contract)\\b\\s+(\\w+)\\b\\s+\\b(is)\\b\\s+",
+          "end": "(?=\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.contract"
+            },
+            "2": {
+              "name": "entity.name.type.contract"
+            },
+            "3": {
+              "name": "storage.modifier.is"
+            }
+          },
+          "patterns": [
+            {
+              "match": "\\b(\\w+)\\b",
+              "name": "entity.name.type.contract.extend"
+            }
+          ]
         }
@@ -433,11 +710,36 @@ ]
     "declaration-interface": {
-      "match": "\\b(interface)(\\s+([A-Za-z_]\\w*))?\\b",
-      "captures": {
-        "1": {
-          "name": "storage.type.interface.solidity"
+      "patterns": [
+        {
+          "match": "\\b(interface)\\b\\s+(\\w+)\\b\\s*(?=\\{)",
+          "captures": {
+            "1": {
+              "name": "storage.type.interface"
+            },
+            "2": {
+              "name": "entity.name.type.interface"
+            }
+          }
         },
-        "3": {
-          "name": "entity.name.type.interface.solidity"
+        {
+          "begin": "\\b(interface)\\b\\s+(\\w+)\\b\\s+\\b(is)\\b\\s+",
+          "end": "(?=\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.interface"
+            },
+            "2": {
+              "name": "entity.name.type.interface"
+            },
+            "3": {
+              "name": "storage.modifier.is"
+            }
+          },
+          "patterns": [
+            {
+              "match": "\\b(\\w+)\\b",
+              "name": "entity.name.type.interface.extend"
+            }
+          ]
         }
-      }
+      ]
     },
@@ -448,6 +750,6 @@ "declaration-library": {
         "1": {
-          "name": "storage.type.library.solidity"
+          "name": "storage.type.library"
         },
         "3": {
-          "name": "entity.name.type.library.solidity"
+          "name": "entity.name.type.library"
         }
@@ -457,52 +759,196 @@ }
     "declaration-struct": {
-      "match": "\\b(struct)(\\s+([A-Za-z_]\\w*))?\\b",
-      "captures": {
-        "1": {
-          "name": "storage.type.struct.solidity"
+      "patterns": [
+        {
+          "match": "\\b(struct)(\\s+([A-Za-z_]\\w*))?\\b",
+          "captures": {
+            "1": {
+              "name": "storage.type.struct"
+            },
+            "3": {
+              "name": "entity.name.type.struct"
+            }
+          }
         },
-        "3": {
-          "name": "entity.name.type.struct.solidity"
+        {
+          "begin": "\\b(struct)\\b\\s*(\\w+)?\\b\\s*(?=\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.struct"
+            },
+            "2": {
+              "name": "entity.name.type.struct"
+            }
+          },
+          "end": "(?=\\})",
+          "patterns": [
+            {
+              "include": "#type-primitive"
+            },
+            {
+              "include": "#variable"
+            },
+            {
+              "include": "#punctuation"
+            },
+            {
+              "include": "#comment"
+            }
+          ]
         }
-      }
+      ]
     },
     "declaration-event": {
-      "match": "\\b(event)(\\s+([A-Za-z_]\\w*))?\\b",
-      "captures": {
-        "1": {
-          "name": "storage.type.event.solidity"
+      "patterns": [
+        {
+          "begin": "\\b(event)\\b(?:\\s+(\\w+)\\b)?",
+          "end": "(?=\\))",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.event"
+            },
+            "2": {
+              "name": "entity.name.type.event"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type-primitive"
+            },
+            {
+              "match": "\\b(?:(indexed)\\s)?(\\w+)(?:,\\s*|)",
+              "captures": {
+                "1": {
+                  "name": "storage.type.modifier.indexed"
+                },
+                "2": {
+                  "name": "variable.parameter.event"
+                }
+              }
+            },
+            {
+              "include": "#punctuation"
+            }
+          ]
         },
-        "3": {
-          "name": "entity.name.type.event.solidity"
+        {
+          "match": "\\b(event)(\\s+([A-Za-z_]\\w*))?\\b",
+          "captures": {
+            "1": {
+              "name": "storage.type.event"
+            },
+            "3": {
+              "name": "entity.name.type.event"
+            }
+          }
         }
-      }
+      ]
     },
-    "declaration-error": {
-      "match": "\\b(error)(\\s+([A-Za-z_]\\w*))?\\b",
-      "captures": {
-        "1": {
-          "name": "storage.type.error.solidity"
+    "declaration-constructor": {
+      "patterns": [
+        {
+          "begin": "\\b(constructor)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.constructor"
+            }
+          },
+          "end": "(?=\\{)",
+          "patterns": [
+            {
+              "begin": "\\G\\s*(?=\\()",
+              "end": "(?=\\))",
+              "patterns": [
+                {
+                  "include": "#declaration-function-parameters"
+                }
+              ]
+            },
+            {
+              "begin": "(?<=\\))",
+              "end": "(?=\\{)",
+              "patterns": [
+                {
+                  "include": "#type-modifier-access"
+                },
+                {
+                  "include": "#function-call"
+                }
+              ]
+            }
+          ]
         },
-        "3": {
-          "name": "entity.name.type.error.solidity"
+        {
+          "match": "\\b(constructor)\\b",
+          "captures": {
+            "1": {
+              "name": "storage.type.constructor"
+            }
+          }
         }
-      }
+      ]
     },
-    "declaration-constructor": {
-      "match": "\\b(constructor)\\b",
-      "captures": {
-        "1": {
-          "name": "storage.type.constructor.solidity"
+    "declaration-enum": {
+      "patterns": [
+        {
+          "begin": "\\b(enum)\\s+(\\w+)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.enum"
+            },
+            "2": {
+              "name": "entity.name.type.enum"
+            }
+          },
+          "end": "(?=\\})",
+          "patterns": [
+            {
+              "match": "\\b(\\w+)\\b",
+              "name": "variable.other.enummember"
+            },
+            {
+              "include": "#punctuation"
+            }
+          ]
+        },
+        {
+          "match": "\\b(enum)(\\s+([A-Za-z_]\\w*))?\\b",
+          "captures": {
+            "1": {
+              "name": "storage.type.enum"
+            },
+            "3": {
+              "name": "entity.name.type.enum"
+            }
+          }
         }
-      }
+      ]
     },
-    "declaration-enum": {
-      "match": "\\b(enum)(\\s+([A-Za-z_]\\w*))?\\b",
-      "captures": {
-        "1": {
-          "name": "storage.type.enum.solidity"
+    "declaration-function-parameters": {
+      "begin": "\\G\\s*(?=\\()",
+      "end": "(?=\\))",
+      "patterns": [
+        {
+          "include": "#type-primitive"
         },
-        "3": {
-          "name": "entity.name.type.enum.solidity"
+        {
+          "include": "#type-modifier-extended-scope"
+        },
+        {
+          "match": "\\b([A-Z]\\w*)\\b",
+          "captures": {
+            "1": {
+              "name": "storage.type.struct"
+            }
+          }
+        },
+        {
+          "include": "#variable"
+        },
+        {
+          "include": "#punctuation"
+        },
+        {
+          "include": "#comment"
         }
-      }
+      ]
     },
@@ -512,33 +958,162 @@ "declaration-function": {
         {
+          "begin": "\\b(function)\\s+(\\w+)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function"
+            },
+            "2": {
+              "name": "entity.name.function"
+            }
+          },
+          "end": "(?=\\{|;)",
+          "patterns": [
+            {
+              "include": "#natspec"
+            },
+            {
+              "include": "#global"
+            },
+            {
+              "include": "#declaration-function-parameters"
+            },
+            {
+              "include": "#type-modifier-access"
+            },
+            {
+              "include": "#type-modifier-payable"
+            },
+            {
+              "include": "#type-modifier-immutable"
+            },
+            {
+              "include": "#type-modifier-extended-scope"
+            },
+            {
+              "include": "#control-flow"
+            },
+            {
+              "include": "#function-call"
+            },
+            {
+              "include": "#modifier-call"
+            }
+          ]
+        },
+        {
           "match": "\\b(function)\\s+([A-Za-z_]\\w*)\\b",
           "captures": {
             "1": {
-              "name": "storage.type.function.solidity"
+              "name": "storage.type.function"
             },
             "2": {
-              "name": "entity.name.function.solidity"
+              "name": "entity.name.function"
             }
           }
+        }
+      ]
+    },
+    "declaration-modifier": {
+      "patterns": [
+        {
+          "begin": "\\b(modifier)\\b\\s*(\\w+)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function.modifier"
+            },
+            "2": {
+              "name": "entity.name.function.modifier"
+            }
+          },
+          "end": "(?=\\{)",
+          "patterns": [
+            {
+              "include": "#declaration-function-parameters"
+            },
+            {
+              "begin": "(?<=\\))",
+              "end": "(?=\\{)",
+              "patterns": [
+                {
+                  "include": "#declaration-function-parameters"
+                },
+                {
+                  "include": "#type-modifier-access"
+                },
+                {
+                  "include": "#type-modifier-payable"
+                },
+                {
+                  "include": "#type-modifier-immutable"
+                },
+                {
+                  "include": "#type-modifier-extended-scope"
+                },
+                {
+                  "include": "#function-call"
+                },
+                {
+                  "include": "#modifier-call"
+                },
+                {
+                  "include": "#control-flow"
+                }
+              ]
+            }
+          ]
         },
         {
-          "match": "\\b(private|public|internal|external|constant|immutable|pure|view|payable|nonpayable|inherited|indexed|storage|memory|virtual|calldata|override|abstract)\\b",
-          "name": "storage.type.mofifier.solidity"
+          "match": "\\b(modifier)(\\s+([A-Za-z_]\\w*))?\\b",
+          "captures": {
+            "1": {
+              "name": "storage.type.modifier"
+            },
+            "3": {
+              "name": "entity.name.function"
+            }
+          }
         }
       ]
     },
-    "declaration-modifier": {
-      "match": "\\b(modifier)(\\s+([A-Za-z_]\\w*))?\\b",
+    "declaration-storage-mapping": {
+      "patterns": [
+        {
+          "begin": "\\b(mapping)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.mapping"
+            }
+          },
+          "end": "(?=\\))",
+          "patterns": [
+            {
+              "include": "#declaration-storage-mapping"
+            },
+            {
+              "include": "#type-primitive"
+            },
+            {
+              "include": "#punctuation"
+            },
+            {
+              "include": "#operator"
+            }
+          ]
+        },
+        {
+          "match": "\\b(mapping)\\b",
+          "name": "storage.type.mapping"
+        }
+      ]
+    },
+    "declaration-error": {
+      "match": "\\b(error)(\\s+([A-Za-z_]\\w*))?\\b",
       "captures": {
         "1": {
-          "name": "storage.type.modifier.solidity"
+          "name": "storage.type.error"
         },
         "3": {
-          "name": "entity.name.function.solidity"
+          "name": "entity.name.type.error"
         }
       }
     },
-    "declaration-mapping": {
-      "match": "\\b(mapping)\\b",
-      "name": "storage.type.mapping.solidity"
-    },
     "function-call": {
@@ -548,3 +1123,3 @@ "match": "\\b([A-Za-z_]\\w*)\\s*\\(",
         "1": {
-          "name": "entity.name.function.solidity"
+          "name": "entity.name.function"
         }
@@ -557,7 +1132,7 @@ }
           "match": "\\b(assembly)\\b",
-          "name": "keyword.control.assembly.solidity"
+          "name": "keyword.control.assembly"
         },
         {
           "match": "\\b(let)\\b",
-          "name": "storage.type.assembly.solidity"
+          "name": "storage.type.assembly"
         }
@@ -570,11 +1145,35 @@ ]
           "match": ";",
-          "name": "punctuation.terminator.statement.solidity"
+          "name": "punctuation.terminator.statement"
         },
         {
           "match": "\\.",
-          "name": "punctuation.accessor.solidity"
+          "name": "punctuation.accessor"
         },
         {
           "match": ",",
-          "name": "punctuation.separator.solidity"
+          "name": "punctuation.separator"
+        },
+        {
+          "match": "\\{",
+          "name": "punctuation.brace.curly.begin"
+        },
+        {
+          "match": "\\}",
+          "name": "punctuation.brace.curly.end"
+        },
+        {
+          "match": "\\[",
+          "name": "punctuation.brace.square.begin"
+        },
+        {
+          "match": "\\]",
+          "name": "punctuation.brace.square.end"
+        },
+        {
+          "match": "\\(",
+          "name": "punctuation.parameters.begin"
+        },
+        {
+          "match": "\\)",
+          "name": "punctuation.parameters.end"
         }
@@ -581,0 +1180,0 @@ ]

languages/tex.tmLanguage.json

@@ -11,3 +11,3 @@ {
       },
-      "match": "(\\\\)(backmatter|else|fi|frontmatter|mainmatter|if(case|cat|dim|eof|false|hbox|hmode|inner|mmode|num|odd|true|undefined|vbox|vmode|void|x)?)\\b",
+      "match": "(\\\\)(backmatter|else|fi|frontmatter|mainmatter|if(case|cat|dim|eof|false|hbox|hmode|inner|mmode|num|odd|true|undefined|vbox|vmode|void|x)?)(?![a-zA-Z@])",
       "name": "keyword.control.tex"
@@ -50,3 +50,3 @@ },
           "end": "$\\n?",
-          "name": "comment.line.percentage.semicolon.texshop.tex"
+          "name": "comment.line.percentage.tex"
         },
@@ -61,3 +61,3 @@ {
           "end": "$\\n?",
-          "name": "comment.line.percentage.directive.texshop.tex"
+          "name": "comment.line.percentage.directive.tex"
         },
@@ -117,3 +117,3 @@ {
       },
-      "match": "(\\\\)[A-Za-z@,;]+",
+      "match": "(\\\\)(?:[A-Za-z@]+|[,;])",
       "name": "support.function.general.tex"
@@ -135,2 +135,31 @@ },
         {
+          "begin": "((\\\\)(?:text|mbox))(\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "constant.other.math.tex"
+            },
+            "2": {
+              "name": "punctuation.definition.function.tex"
+            },
+            "3": {
+              "name": "punctuation.definition.arguments.begin.tex meta.text.normal.tex"
+            }
+          },
+          "contentName": "meta.text.normal.tex",
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.arguments.end.tex meta.text.normal.tex"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#math"
+            },
+            {
+              "include": "$base"
+            }
+          ]
+        },
+        {
           "captures": {
@@ -137,0 +166,0 @@ "1": {

package.json

 {
   "name": "shiki",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "description": "shiki",
   "author": "Pine Wu <[e-mail]>",
-  "homepage": "https://github.com/octref/shiki/tree/master/packages/shiki",
+  "homepage": "https://github.com/octref/shiki/tree/main/packages/shiki",
   "license": "MIT",
@@ -25,3 +25,2 @@ "main": "dist/index.js",
   "scripts": {
-    "prepublishOnly": "npm run build",
     "build": "rollup -c",
@@ -39,3 +38,6 @@ "watch": "rollup -c -w"
   },
-  "gitHead": "5f5e49a16af6f385af170eb9d153b0650839d681"
+  "browser": {
+    "fs": false,
+    "path": false
+  }
 }

themes/light-plus.json

@@ -585,5 +585,4 @@ {
     "statusBarItem.errorBackground": "#c72e0f",
-    "list.focusHighlightForeground": "#9DDDFF",
     "list.activeSelectionIconForeground": "#FFF"
   }
 }

themes/min-dark.json

@@ -86,3 +86,5 @@ {
     "symbolIcon.variableForeground": "#79b8ff",
-    "symbolIcon.enumeratorMemberForeground": "#79b8ff"
+    "symbolIcon.enumeratorMemberForeground": "#79b8ff",
+    "diffEditor.insertedTextBackground": "#3a632a4b",
+    "diffEditor.removedTextBackground": "#88063852"
   },
@@ -140,5 +142,5 @@ "tokenColors": [
     {
-      "scope": ["comment"],
+      "scope": ["comment", "string.quoted.docstring.multi"],
       "settings": {
-        "foreground": "#4e5761"
+        "foreground": "#6b737c"
       }
@@ -251,2 +253,13 @@ },
     {
+      "scope": [
+        "punctuation.definition.arguments",
+        "punctuation.definition.dict",
+        "punctuation.separator",
+        "meta.function-call.arguments"
+      ],
+      "settings": {
+        "foreground": "#bbbbbb"
+      }
+    },
+    {
       "name": "[Custom] Markdown links",
@@ -253,0 +266,0 @@ "scope": "markup.underline.link",

themes/min-light.json

@@ -109,3 +109,5 @@ {
     "symbolIcon.variableForeground": "#1976D2",
-    "symbolIcon.enumeratorMemberForeground": "#1976D2"
+    "symbolIcon.enumeratorMemberForeground": "#1976D2",
+    "diffEditor.removedTextBackground": "#e597af52",
+    "diffEditor.insertedTextBackground": "#b7e7a44b"
   },
@@ -161,3 +163,3 @@ "tokenColors": [
     {
-      "scope": ["comment"],
+      "scope": ["comment", "string.quoted.docstring.multi"],
       "settings": {
@@ -268,2 +270,13 @@ "foreground": "#c2c3c5"
     {
+      "scope": [
+        "punctuation.definition.arguments",
+        "punctuation.definition.dict",
+        "punctuation.separator",
+        "meta.function-call.arguments"
+      ],
+      "settings": {
+        "foreground": "#212121"
+      }
+    },
+    {
       "name": "[Custom] Markdown links",
@@ -270,0 +283,0 @@ "scope": ["markup.underline.link", "punctuation.definition.metadata.markdown"],

themes/nord.json

@@ -1100,2 +1100,33 @@ {
     {
+      "name": "[Markdown] Markup Math Constant",
+      "scope": "text.html.markdown constant.character.math.tex",
+      "settings": {
+        "foreground": "#81A1C1"
+      }
+    },
+    {
+      "name": "[Markdown] Markup Math Definition Marker",
+      "scope": [
+        "text.html.markdown punctuation.definition.math.begin",
+        "text.html.markdown punctuation.definition.math.end"
+      ],
+      "settings": {
+        "foreground": "#5E81AC"
+      }
+    },
+    {
+      "name": "[Markdown] Markup Math Function Definition Marker",
+      "scope": "text.html.markdown punctuation.definition.function.math.tex",
+      "settings": {
+        "foreground": "#88C0D0"
+      }
+    },
+    {
+      "name": "[Markdown] Markup Math Operator",
+      "scope": "text.html.markdown punctuation.math.operator.latex",
+      "settings": {
+        "foreground": "#81A1C1"
+      }
+    },
+    {
       "name": "[Markdown] Punctuation Definition Heading",
@@ -1102,0 +1133,0 @@ "scope": "text.html.markdown punctuation.definition.heading",

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

Total package byte prevSize

7854040

increased by2.45%

Number of package files

170

increased by6.92%

Lines of code

210463

increased by3.17%

No dependency changes