Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-19 00:42:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(code): enable syntax highlighting

Browse Source
This commit is contained in:
Elian Doran 2025-05-10 23:34:23 +03:00
parent 5a07d5a913
commit 01f02b736c
No known key found for this signature in database
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/client/src/widgets/type_widgets/editable_code.ts
View File

@ -66,6 +66,7 @@ export default class EditableCodeTypeWidget extends AbstractCodeTypeWidget {
this._update(note, blob?.content ?? ""); this._update(note, blob?.content ?? "");
}); });
this.codeEditor.setMimeType(note.mime);
this.show(); this.show();
if (this.parent && hasTouchBar) { if (this.parent && hasTouchBar) {

22
packages/codemirror/src/index.ts
View File

@ -1,6 +1,8 @@
import { defaultKeymap, indentWithTab } from "@codemirror/commands"; import { defaultKeymap, indentWithTab } from "@codemirror/commands";
import { EditorView, keymap, lineNumbers, ViewUpdate, type EditorViewConfig, type KeyBinding } from "@codemirror/view"; import { EditorView, keymap, lineNumbers, ViewUpdate, type EditorViewConfig, type KeyBinding } from "@codemirror/view";
import { defaultHighlightStyle, syntaxHighlighting } from "@codemirror/language"; import { defaultHighlightStyle, StreamLanguage, syntaxHighlighting } from "@codemirror/language";
import { Compartment } from "@codemirror/state";
import byMimeType from "./syntax_highlighting.js";
type ContentChangedListener = () => void; type ContentChangedListener = () => void;
@ -11,13 +13,16 @@ export interface EditorConfig extends EditorViewConfig {
export default class CodeMirror extends EditorView { export default class CodeMirror extends EditorView {
private config: EditorConfig; private config: EditorConfig;
private languageCompartment: Compartment;
constructor(config: EditorConfig) { constructor(config: EditorConfig) {
const languageCompartment = new Compartment();
let extensions = [ let extensions = [
keymap.of([ keymap.of([
...defaultKeymap, ...defaultKeymap,
indentWithTab indentWithTab
]), ]),
languageCompartment.of([]),
syntaxHighlighting(defaultHighlightStyle), syntaxHighlighting(defaultHighlightStyle),
lineNumbers() lineNumbers()
]; ];
@ -35,6 +40,7 @@ export default class CodeMirror extends EditorView {
extensions extensions
}); });
this.config = config; this.config = config;
this.languageCompartment = languageCompartment;
} }
#onDocumentUpdated(v: ViewUpdate) { #onDocumentUpdated(v: ViewUpdate) {
@ -56,4 +62,18 @@ export default class CodeMirror extends EditorView {
} }
}) })
} }
async setMimeType(mime: string) {
const newExtension = [];
const correspondingSyntax = byMimeType[mime];
if (correspondingSyntax) {
const extension = StreamLanguage.define(await correspondingSyntax());
newExtension.push(extension);
}
this.dispatch({
effects: this.languageCompartment.reconfigure(newExtension)
});
}
} }

4
packages/codemirror/src/syntax_highlighting.ts
View File

@ -1,6 +1,6 @@
import { type StreamParser } from "@codemirror/language" import { type StreamParser } from "@codemirror/language"
const mappings: Record<string, (() => Promise<StreamParser<unknown>>) | null> = { const byMimeType: Record<string, (() => Promise<StreamParser<unknown>>) | null> = {
"text/plain": null, "text/plain": null,
"text/apl": async () => (await import('@codemirror/legacy-modes/mode/apl')).apl, "text/apl": async () => (await import('@codemirror/legacy-modes/mode/apl')).apl,
"text/x-ttcn-asn": async () => (await import('@codemirror/legacy-modes/mode/ttcn')).ttcn, "text/x-ttcn-asn": async () => (await import('@codemirror/legacy-modes/mode/ttcn')).ttcn,
@ -162,4 +162,4 @@ const mappings: Record<string, (() => Promise<StreamParser<unknown>>) | null> =
"text/x-z80": async () => (await import('@codemirror/legacy-modes/mode/z80')).z80 "text/x-z80": async () => (await import('@codemirror/legacy-modes/mode/z80')).z80
} }
export default mappings; export default byMimeType;