gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-08 07:28:59 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

feat(linter/mermaid): better handling of zero position

Browse Source
This commit is contained in:
Elian Doran 2025-03-22 01:24:41 +02:00
parent 5d8ac3b9f7
commit 8b08e67fdc
No known key found for this signature in database
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/public/app/widgets/type_widgets/linters/mermaid.spec.ts
View File

@ -21,22 +21,25 @@ describe("Mermaid linter", () => {
expect(result[0].message).toSatisfy((v: string) => v.includes("Expecting 'SPACE'")); expect(result[0].message).toSatisfy((v: string) => v.includes("Expecting 'SPACE'"));
expect(result[0]).toMatchObject({ expect(result[0]).toMatchObject({
from: { line: 0, col: 0 }, from: { line: 0, col: 0 },
to: { line: 0, col: 0 } to: { line: 0, col: 1 }
}); });
}); });
it("reports correctly basic arrow missing in diagram", async () => { it("reports correctly basic arrow missing in diagram", async () => {
const input = trimIndentation`\ const input = trimIndentation`\
stateDiagram-v2 xychart-beta horizontal
[*] -> Still title "Percentage usge"
x-axis [data, sys, usr, var]
y-axis 0--->100
bar [20, 70, 0, 0]
`; `;
const result = await validateMermaid(input); const result = await validateMermaid(input);
expect(result.length).toBe(1); expect(result.length).toBe(1);
expect(result[0].message).toSatisfy((v: string) => v.includes("Expecting 'SPACE'")); expect(result[0].message).toSatisfy((v: string) => v.includes("Expecting 'ARROW_DELIMITER'"));
expect(result[0]).toMatchObject({ expect(result[0]).toMatchObject({
from: { line: 1, col: 0 }, from: { line: 3, col: 8 },
to: { line: 1, col: 3 } to: { line: 3, col: 9 }
}); });
}); });
}); });

10
src/public/app/widgets/type_widgets/linters/mermaid.ts
View File

@ -31,12 +31,12 @@ export async function validateMermaid(text: string) {
const mermaidError = (e as MermaidParseError); const mermaidError = (e as MermaidParseError);
const loc = mermaidError.hash.loc; const loc = mermaidError.hash.loc;
let firstCol = loc.first_column;
let lastCol = loc.last_column;
if (firstCol !== 0 && lastCol !== 0) { let firstCol = loc.first_column + 1;
firstCol = lastCol + 1; let lastCol = loc.last_column + 1;
lastCol = firstCol + 1;
if (firstCol === 1 && lastCol === 1) {
firstCol = 0;
} }
return [ return [