Skip to content

Build your personal knowledge base with Trilium Notes

fix(codemirror): accept Mermaid's card id syntax in kanban notes

Elian Doranbc166a20ae7b
diff --git a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
index 1dbdd243f1..9f09fe132c 100644
--- a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
+++ b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
@@ -61,3 +61,11 @@ describe("mermaid", () => {
.toBe("MermaidDiagram(⚠)");
});
});
+
+describe("kanban grammar", () => {
+ it("ends a card id before the spaces that separate it from its text", () => {
+ const doc = "kanban\n todo\n my-card [Task]";
+ const id = parserOf("kanban").parse(doc).topNode.getChild("Card")?.getChild("NodeId");
+ expect(id && doc.slice(id.from, id.to)).toBe("my-card");
+ });
+});
diff --git a/packages/codemirror/src/languages/mermaid/parsers/kanban/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/kanban/tokens.ts
index 1c612e0a94..656ff10a9c 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/kanban/tokens.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/kanban/tokens.ts
@@ -15,8 +15,12 @@ const newline = 10,
at = 64,
braceL = 123,
braceR = 125,
+ parenL = 40,
+ parenR = 41,
underscore = 95;
+const ID_TERMINATORS = [ newline, -1, bracketL, braceL, braceR, parenL, parenR ];
+
const isWordChar = (c: number) =>
(c >= 48 && c <= 57) ||
(c >= 65 && c <= 90) ||
@@ -50,19 +54,23 @@ export const columnTitleTokens = new ExternalTokenizer((input) => {
}
});
-// A card id that is immediately followed by "[", e.g. docs[...] or id6[...].
+// A card id followed by "[", e.g. docs[...], my-card[...] or id6 [...]. Like Mermaid, an id
+// runs up to the first bracket, brace or parenthesis; trailing spaces are not part of it.
export const nodeIdTokens = new ExternalTokenizer((input) => {
if (!isWordChar(input.next)) return;
let length = 0;
-
- while (isWordChar(input.next)) {
+ let idLength = 0;
+ while (!ID_TERMINATORS.includes(input.next)) {
input.advance();
length++;
+ if (input.peek(-1) !== space) {
+ idLength = length;
+ }
}
- if (length > 0 && (input.next as number) === bracketL) {
- input.acceptToken(nodeIdTerm);
+ if (input.next === bracketL) {
+ input.acceptToken(nodeIdTerm, idLength - length);
}
});
diff --git a/packages/codemirror/src/languages/mermaid/test/kanban.txt b/packages/codemirror/src/languages/mermaid/test/kanban.txt
index ab1788a366..4883eb0107 100644
--- a/packages/codemirror/src/languages/mermaid/test/kanban.txt
+++ b/packages/codemirror/src/languages/mermaid/test/kanban.txt
@@ -78,3 +78,33 @@ kanban
==>
KanbanDiagram(DiagramName,LineComment,Column(ColumnTitle))
+
+# Card id with a hyphen
+
+kanban
+ todo
+ my-card[Task]
+
+==>
+
+KanbanDiagram(DiagramName,Column(ColumnTitle),Card(NodeId,Node("[",CardText,"]")))
+
+# Space between a card id and its text
+
+kanban
+ todo
+ id1 [Task]
+
+==>
+
+KanbanDiagram(DiagramName,Column(ColumnTitle),Card(NodeId,Node("[",CardText,"]")))
+
+# Card id with a parenthesis
+
+kanban
+ todo
+ a(b)[Task]
+
+==>
+
+KanbanDiagram(DiagramName,Column(ColumnTitle),Card(Node(⚠,CardText,"]")))