summaryrefslogtreecommitdiff
path: root/packages/frontend/src/scripts/code-highlighter.ts
diff options
context:
space:
mode:
authorMarie <marie@kaifa.ch>2024-02-09 19:22:06 +0100
committerMarie <marie@kaifa.ch>2024-02-09 19:22:06 +0100
commit85355813ad07724a2fad4abdbf694d696482d439 (patch)
tree79bbf9a76c17f4022754cb09a6db5b22b673d31a /packages/frontend/src/scripts/code-highlighter.ts
parentmerge: more upstream changes (diff)
parentfix misskey-js version (diff)
downloadsharkey-85355813ad07724a2fad4abdbf694d696482d439.tar.gz
sharkey-85355813ad07724a2fad4abdbf694d696482d439.tar.bz2
sharkey-85355813ad07724a2fad4abdbf694d696482d439.zip
merge: latest changes
Diffstat (limited to 'packages/frontend/src/scripts/code-highlighter.ts')
-rw-r--r--packages/frontend/src/scripts/code-highlighter.ts9
1 files changed, 3 insertions, 6 deletions
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,
],
});