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

feat(code): integrate indentation markers

Browse Source
This commit is contained in:
Elian Doran 2025-05-13 14:32:50 +03:00
parent 3ace3d9ed9
commit 28aaa28ce5
No known key found for this signature in database
4 changed files with 301 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Release Notes/Release Notes/v0.94.0.md
View File

@ -33,6 +33,7 @@
* Code notes: * Code notes:
* Added the GDScript (Godot) language. * Added the GDScript (Godot) language.
* Added the Nix language (and also in code blocks for text notes). * Added the Nix language (and also in code blocks for text notes).
* Added an indentation marker.
* Mermaid diagrams: basic syntax highlight (not all diagram types are supported) and code folding. * Mermaid diagrams: basic syntax highlight (not all diagram types are supported) and code folding.
* Slight organization in Appearance settings: code block themes are now in "Text Notes", added a "Related settings" section in Appearance. * Slight organization in Appearance settings: code block themes are now in "Text Notes", added a "Related settings" section in Appearance.

1
packages/codemirror/package.json
View File

@ -54,6 +54,7 @@
"@fsegurai/codemirror-theme-volcano": "6.1.4", "@fsegurai/codemirror-theme-volcano": "6.1.4",
"@fsegurai/codemirror-theme-vscode-dark": "6.1.4", "@fsegurai/codemirror-theme-vscode-dark": "6.1.4",
"@fsegurai/codemirror-theme-vscode-light": "6.1.4", "@fsegurai/codemirror-theme-vscode-light": "6.1.4",
"@replit/codemirror-indentation-markers": "6.5.3",
"@replit/codemirror-lang-nix": "6.0.1", "@replit/codemirror-lang-nix": "6.0.1",
"@replit/codemirror-vim": "6.3.0", "@replit/codemirror-vim": "6.3.0",
"@ssddanbrown/codemirror-lang-smarty": "1.0.0", "@ssddanbrown/codemirror-lang-smarty": "1.0.0",

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

@ -4,6 +4,7 @@ import { defaultHighlightStyle, StreamLanguage, syntaxHighlighting, indentUnit,
import { Compartment, EditorSelection, EditorState, type Extension } from "@codemirror/state"; import { Compartment, EditorSelection, EditorState, type Extension } from "@codemirror/state";
import { highlightSelectionMatches } from "@codemirror/search"; import { highlightSelectionMatches } from "@codemirror/search";
import { vim } from "@replit/codemirror-vim"; import { vim } from "@replit/codemirror-vim";
import { indentationMarkers } from "@replit/codemirror-indentation-markers";
import byMimeType from "./syntax_highlighting.js"; import byMimeType from "./syntax_highlighting.js";
import smartIndentWithTab from "./extensions/custom_tab.js"; import smartIndentWithTab from "./extensions/custom_tab.js";
import type { ThemeDefinition } from "./color_themes.js"; import type { ThemeDefinition } from "./color_themes.js";
@ -62,6 +63,7 @@ export default class CodeMirror extends EditorView {
bracketMatching(), bracketMatching(),
lineNumbers(), lineNumbers(),
foldGutter(), foldGutter(),
indentationMarkers(),
indentUnit.of(" ".repeat(4)), indentUnit.of(" ".repeat(4)),
keymap.of([ keymap.of([
...defaultKeymap, ...defaultKeymap,

591
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff