summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-02-09 00:08:33 +0900
committerGitHub <noreply@github.com>2024-02-09 00:08:33 +0900
commitd40612ac522df8f67758daa0ad17eea7cb2d6da2 (patch)
treeb3f43fba5b0469106cd8dd1baa939efd9b69e68c /packages
parentrefactor(backend): exist -> exists (#13203) (diff)
downloadsharkey-d40612ac522df8f67758daa0ad17eea7cb2d6da2.tar.gz
sharkey-d40612ac522df8f67758daa0ad17eea7cb2d6da2.tar.bz2
sharkey-d40612ac522df8f67758daa0ad17eea7cb2d6da2.zip
fix(frontend): aiscriptのコードブロックでのハイライト指定を修正 (#13208)
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/package.json2
-rw-r--r--packages/frontend/src/scripts/code-highlighter.ts9
2 files changed, 4 insertions, 7 deletions
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 9e88c6c036..d8ba08501e 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -29,7 +29,7 @@
"@twemoji/parser": "15.0.0",
"@vitejs/plugin-vue": "5.0.3",
"@vue/compiler-sfc": "3.4.15",
- "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.6",
+ "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.2",
"astring": "1.8.6",
"broadcast-channel": "7.0.0",
"buraha": "0.0.1",
diff --git a/packages/frontend/src/scripts/code-highlighter.ts b/packages/frontend/src/scripts/code-highlighter.ts
index b11dfed41a..2733897bab 100644
--- a/packages/frontend/src/scripts/code-highlighter.ts
+++ b/packages/frontend/src/scripts/code-highlighter.ts
@@ -20,7 +20,7 @@ export async function getTheme(mode: 'light' | 'dark', getName = false): Promise
const base = [lightTheme, darkTheme].find(x => x.id === theme.base);
if (base && base.codeHighlighter) theme.codeHighlighter = Object.assign({}, base.codeHighlighter, theme.codeHighlighter);
}
-
+
if (theme.codeHighlighter) {
let _res: ThemeRegistration = {};
if (theme.codeHighlighter.base === '_none_') {
@@ -55,7 +55,7 @@ export async function getHighlighter(): Promise<Highlighter> {
export async function initHighlighter() {
const aiScriptGrammar = await import('aiscript-vscode/aiscript/syntaxes/aiscript.tmLanguage.json');
-
+
await loadWasm(import('shiki/onig.wasm?init'));
// テーマの重複を消す
@@ -68,10 +68,7 @@ export async function initHighlighter() {
themes,
langs: [
import('shiki/langs/javascript.mjs'),
- {
- aliases: ['is', 'ais'],
- ...aiScriptGrammar.default,
- } as unknown as LanguageRegistration,
+ aiScriptGrammar.default as unknown as LanguageRegistration,
],
});