CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.14.7 | 2023-12-15
+
+### 🙌 Contributions
+
+- doc: fix typo | [#544](https://github.com/shikijs/shiki/pull/544) | [@Seven-Y-Q-Guo](https://github.com/Seven-Y-Q-Guo)
+- feat: Add `nushell` grammar | [#522](https://github.com/shikijs/shiki/pull/522) | [@hustcer](https://github.com/hustcer)
+- feat: add `wl` alias for `wolfram` | [#535](https://github.com/shikijs/shiki/pull/535) | [@stone-zeng](https://github.com/stone-zeng)
+
+
 ## 0.14.6 | 2023-12-07
 
 ### 🚀 Features & Fixes

README.md

@@ -372,7 +372,7 @@ The default functionality of rendering code blocks would use `codeToHtml` from t
 If you want to render the tokens into a code yourself, Shiki exposes two key methods to do that.
 
 - `codeToThemedTokens` takes a code string and a language id and returns an array of tokens. A token represents a single part of the code, for example a keyword, a string, a comment, etc.
-- `renderToHTML` takes an array of tokens and returns an HTML string that represents the provided code.
+- `renderToHtml` takes an array of tokens and returns an HTML string that represents the provided code.
 
 ```js
 import shiki, { getHighlighter } from 'shiki'
@@ -389,15 +389,15 @@ const code = `console.log("Here is your code.");`
 const tokens = highlighter.codeToThemedTokens(code, 'javascript')
 
 // This will return an HTML string that represents the provided code.
-const html = shiki.renderToHTML(tokens)
+const html = shiki.renderToHtml(tokens)
 ```
 
-Alternatively you can add to `renderToHTML` the desired element shape for `pre`, `code`, `line (span)`, and `token (span)`, and override the theme colors for background and foreground.
+Alternatively you can add to `renderToHtml` the desired element shape for `pre`, `code`, `line (span)`, and `token (span)`, and override the theme colors for background and foreground.
 
 For more about that, or to build your own renderer, check out the implementation in [shiki](./packages/shiki/src/renderer.ts).
 
 ```js
-const html = shiki.renderToHTML(tokens, {
+const html = shiki.renderToHtml(tokens, {
   fg: highlighter.getForegroundColor('nord'), // Set a specific foreground color.
   bg: highlighter.getBackgroundColor('nord'), // Set a specific background color.
   // Specified elements override the default elements.

docs/languages.md

@@ -156,6 +156,7 @@ export type Lang =
   | 'nginx'
   | 'nim'
   | 'nix'
+  | 'nushell' | 'nu'
   | 'objective-c' | 'objc'
   | 'objective-cpp'
   | 'ocaml'
@@ -220,7 +221,7 @@ export type Lang =
   | 'wasm'
   | 'wenyan' | '文言'
   | 'wgsl'
-  | 'wolfram'
+  | 'wolfram' | 'wl'
   | 'xml'
   | 'xsl'
   | 'yaml' | 'yml'

docs/themes.md

@@ -136,7 +136,6 @@ export type Theme =
   | 'github-dark-dimmed'
   | 'github-dark'
   | 'github-light'
-  | 'hc_light'
   | 'light-plus'
   | 'material-theme-darker'
   | 'material-theme-lighter'
@@ -156,6 +155,7 @@ export type Theme =
   | 'slack-ochin'
   | 'solarized-dark'
   | 'solarized-light'
+  | 'vitesse-black'
   | 'vitesse-dark'
   | 'vitesse-light'
 ```

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
   "useWorkspaces": true,
-  "version": "0.14.6",
+  "version": "0.14.7",
   "npmClient": "pnpm"
 }

packages/renderer-path/package.json

@@ -1,7 +1,7 @@
 {
   "private": "true",
   "name": "shiki-renderer-path",
-  "version": "0.14.6",
+  "version": "0.14.7",
   "description": "Path renderer for shiki",
   "author": "Pine Wu <octref@gmail.com>",
   "homepage": "https://github.com/octref/shiki/tree/main/packages/renderer-path",
@@ -31,6 +31,6 @@
     "@types/node": "^18.11.17",
     "@types/opentype.js": "^1.3.4",
     "opentype.js": "^1.3.4",
-    "shiki": "^0.14.6"
+    "shiki": "^0.14.7"
   }
 }

packages/renderer-svg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shiki-renderer-svg",
-  "version": "0.14.6",
+  "version": "0.14.7",
   "description": "SVG renderer for shiki",
   "author": "Pine Wu <octref@gmail.com>",
   "homepage": "https://github.com/octref/shiki/tree/main/packages/renderer-svg",
@@ -30,6 +30,6 @@
   "devDependencies": {
     "@types/node": "^18.11.17",
     "playwright": "^1.29.0",
-    "shiki": "^0.14.6"
+    "shiki": "^0.14.7"
   }
 }

packages/shiki/languages/fsharp.tmLanguage.json

@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/ionide/ionide-fsgrammar/commit/078bbf85225b82de3ae4c2db7ee74d9239b249ce",
+  "version": "https://github.com/ionide/ionide-fsgrammar/commit/472c6b2030c962217cbbb26e4ddcce1b8ffe0867",
   "name": "fsharp",
   "scopeName": "source.fsharp",
   "patterns": [
@@ -600,7 +600,7 @@
         },
         {
           "name": "comment.line.double-slash.fsharp",
-          "match": "(?<![!%&+-.<=>?@^|/])//(?![!%&+-.<=>?@^|]).*$"
+          "match": "(?<![!%&+-.<=>?@^|/])//(.*$)"
         }
       ]
     },
@@ -630,7 +630,7 @@
     },
     "abstract_definition": {
       "name": "abstract.definition.fsharp",
-      "begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(:)",
+      "begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(<)?",
       "end": "\\s*(with)\\b|=|$",
       "beginCaptures": {
         "1": {
@@ -676,7 +676,7 @@
           }
         },
         {
-          "match": "(?!with|get|set\\b)\\b([\\w0-9'`^._]+)",
+          "match": "(?!with|get|set\\b)\\s*([\\w0-9'`^._]+)",
           "comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
           "captures": {
             "1": {

packages/shiki/languages/java.tmLanguage.json

@@ -4,7 +4,7 @@
     "If you want to provide a fix or improvement, please create a pull request against the original repository.",
     "Once accepted there, we are happy to receive an update request."
   ],
-  "version": "https://github.com/redhat-developer/vscode-java/commit/5d224a552cf5f0f8ebccf69e43e2575ed2c13839",
+  "version": "https://github.com/redhat-developer/vscode-java/commit/f09b712f5d6d6339e765f58c8dfab3f78a378183",
   "name": "java",
   "scopeName": "source.java",
   "patterns": [
@@ -1598,11 +1598,7 @@
           "name": "string.quoted.triple.java",
           "patterns": [
             {
-              "match": "\\\\\"\"\"",
-              "name": "constant.character.escape.java"
-            },
-            {
-              "match": "\\\\.",
+              "match": "(\\\\\"\"\")(?!\")|(\\\\.)",
               "name": "constant.character.escape.java"
             }
           ]