Skip to content

Build your personal knowledge base with Trilium Notes

feat(codemirror): highlight Mermaid Ishikawa diagrams

Elian Doran4159d1a8e4f9
diff --git a/packages/codemirror/src/languages/mermaid/index.ts b/packages/codemirror/src/languages/mermaid/index.ts
index 23bade8219..1cbfa3cd55 100644
--- a/packages/codemirror/src/languages/mermaid/index.ts
+++ b/packages/codemirror/src/languages/mermaid/index.ts
@@ -17,6 +17,7 @@ import { parser as eventModelingParser } from "./parsers/eventmodeling/parser.js
import { parser as flowchartParser } from "./parsers/flowchart/parser.js";
import { parser as ganttParser } from "./parsers/gantt/parser.js";
import { parser as gitParser } from "./parsers/git/parser.js";
+import { parser as ishikawaParser } from "./parsers/ishikawa/parser.js";
import { parser as journeyParser } from "./parsers/journey/parser.js";
import { parser as kanbanParser } from "./parsers/kanban/parser.js";
import { parser as mermaidParser } from "./parsers/mermaid/parser.js";
@@ -57,6 +58,7 @@ export const DIAGRAM_PARSERS: Record<string, LRParser> = {
FlowchartDiagram: flowchartParser,
GanttDiagram: ganttParser,
GitDiagram: gitParser,
+ IshikawaDiagram: ishikawaParser,
JourneyDiagram: journeyParser,
KanbanDiagram: kanbanParser,
MindmapDiagram: mindmapParser,
diff --git a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
index 95d25172b5..c108222489 100644
--- a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
+++ b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
@@ -188,6 +188,14 @@ describe("treemap grammar", () => {
});
});
+describe("ishikawa grammar", () => {
+ it("leaves the spaces after a line out of its node", () => {
+ const doc = "ishikawa-beta\n Blurry photo \t\n Process";
+ const effect = parserOf("ishikawa").parse(doc).topNode.getChild("Effect");
+ expect(effect && doc.slice(effect.from, effect.to)).toBe("Blurry photo");
+ });
+});
+
describe("foldByIndent", () => {
function foldAt(doc: string, lineNumber: number) {
const state = EditorState.create({ doc, extensions: [ foldByIndent() ] });
diff --git a/packages/codemirror/src/languages/mermaid/parsers/ishikawa/highlight.ts b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/highlight.ts
new file mode 100644
index 0000000000..9e305005b3
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/highlight.ts
@@ -0,0 +1,10 @@
+import { styleTags } from "@lezer/highlight";
+
+import { ishikawaTags } from "../../tags/index.js";
+
+export const ishikawaHighlighting = styleTags({
+ Category: ishikawaTags.category,
+ DiagramName: ishikawaTags.diagramName,
+ Effect: ishikawaTags.effect,
+ LineComment: ishikawaTags.lineComment
+});
diff --git a/packages/codemirror/src/languages/mermaid/parsers/ishikawa/ishikawa.grammar b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/ishikawa.grammar
new file mode 100644
index 0000000000..e997025f3e
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/ishikawa.grammar
@@ -0,0 +1,18 @@
+// Follows Mermaid's Ishikawa (fishbone) diagram, whose parser reads one node per line: the first
+// is the effect, and indentation sets the rest apart into categories and the causes under them.
+@top IshikawaDiagram { DiagramName (Effect (Category | Cause)*)? }
+
+DiagramName { "ishikawa-beta" | "ishikawa" }
+
+@context trackLevels from "./tokens.js"
+
+@skip { space | LineComment }
+
+@external tokens lines from "./tokens.js" { Effect, Category, Cause }
+
+@tokens {
+ space { $[ \t\r\n]+ }
+ LineComment { "%%" ![\n]* }
+}
+
+@external propSource ishikawaHighlighting from "./highlight.js"
diff --git a/packages/codemirror/src/languages/mermaid/parsers/ishikawa/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/parser.terms.ts
new file mode 100644
index 0000000000..b0f41a1178
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/parser.terms.ts
@@ -0,0 +1,9 @@
+// AUTO-GENERATED by scripts/build_mermaid_grammars.mts from the grammar in this directory.
+// This file was generated by lezer-generator. You probably shouldn't edit it.
+export const
+ Effect = 1,
+ Category = 2,
+ Cause = 3,
+ LineComment = 4,
+ IshikawaDiagram = 5,
+ DiagramName = 6
diff --git a/packages/codemirror/src/languages/mermaid/parsers/ishikawa/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/parser.ts
new file mode 100644
index 0000000000..056ccdbceb
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/parser.ts
@@ -0,0 +1,21 @@
+// AUTO-GENERATED by scripts/build_mermaid_grammars.mts from the grammar in this directory.
+// This file was generated by lezer-generator. You probably shouldn't edit it.
+import {LRParser} from "@lezer/lr"
+import {lines, trackLevels} from "./tokens.js"
+import {ishikawaHighlighting} from "./highlight.js"
+export const parser = LRParser.deserialize({
+ version: 14,
+ states: "zOYQQOOOOQP'#Cb'#CbQbQROOQgQROOOOQP'#Cc'#CcQgQROOOOQP-E6a-E6a",
+ stateData: "o~OYOSSOS~OZPO[PO~OPRO~OQSORSO~O",
+ goto: "bWPPPPPPX[RQOQTRRUT",
+ nodeNames: "⚠ Effect Category Cause LineComment IshikawaDiagram DiagramName",
+ maxTerm: 12,
+ context: trackLevels,
+ propSources: [ishikawaHighlighting],
+ skippedNodes: [0,4],
+ repeatNodeCount: 1,
+ tokenData: "$W~RUXYeYZe]^epqeuvv#]#^!e~jSY~XYeYZe]^epqe~yPuv|~!RSS~OY|Z;'S|;'S;=`!_<%lO|~!bP;=`<%l|~!hP#g#h!k~!nP#[#]!q~!tP#]#^!w~!zP#_#`!}~#QP#T#U#T~#WP#k#l#Z~#^P#T#U#a~#fP[~}!O#i~#lP#U#V#o~#rP#X#Y#u~#xP#h#i#{~$OP#T#U$R~$WOZ~",
+ tokenizers: [lines, 0],
+ topRules: {"IshikawaDiagram":[0,5]},
+ tokenPrec: 0
+})
diff --git a/packages/codemirror/src/languages/mermaid/parsers/ishikawa/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/tokens.ts
new file mode 100644
index 0000000000..bf5d837e20
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/ishikawa/tokens.ts
@@ -0,0 +1,49 @@
+import { ContextTracker, ExternalTokenizer, type InputStream } from "@lezer/lr";
+
+import { Category, Cause, Effect } from "./parser.terms.js";
+
+// The context is the indentation of the first category, as Mermaid's `IshikawaDB` keeps its
+// `baseLevel`, or one of these two values before there is one.
+const beforeEffect = -2;
+const beforeCategory = -1;
+
+/**
+ * A node line, without the whitespace around it: the effect first, then a category when it is
+ * indented no deeper than the first line after the effect, or else a cause. A line starting with
+ * `%%` is a comment, but `%%` later in a line is part of its text.
+ */
+export const lines = new ExternalTokenizer((input, stack) => {
+ if ([ -1, 9, 10, 13, 32 ].includes(input.next)) return;
+ if (input.next === 37 && input.peek(1) === 37) return;
+
+ let length = 0;
+ let end = 0;
+ for (let next = input.peek(0); next !== 10 && next !== -1; next = input.peek(++length)) {
+ if (![ 9, 13, 32 ].includes(next)) end = length + 1;
+ }
+
+ const context: number = stack.context;
+ if (context === beforeEffect) {
+ input.acceptToken(Effect, end);
+ } else {
+ const category = context === beforeCategory || indentation(input) <= context;
+ input.acceptToken(category ? Category : Cause, end);
+ }
+}, { contextual: true });
+
+export const trackLevels = new ContextTracker<number>({
+ start: beforeEffect,
+ shift(context, term, _stack, input) {
+ if (term === Effect) return beforeCategory;
+ if (term === Category && context === beforeCategory) return indentation(input);
+ return context;
+ },
+ hash: (context) => context + 2
+});
+
+/** The number of spaces and tabs before the stream position on its line. */
+function indentation(input: InputStream) {
+ let length = 0;
+ while ([ 9, 32 ].includes(input.peek(-length - 1))) length++;
+ return length;
+}
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
index 818d60a222..3e731829ba 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
@@ -24,6 +24,7 @@
RailroadEbnfDiagram |
RailroadAbnfDiagram |
RailroadPegDiagram |
+ IshikawaDiagram |
SankeyDiagram |
XYChartDiagram |
PacketDiagram |
@@ -111,6 +112,7 @@ AccDescr { accDescrKeyword (":" AccText? | "{" accBlockText? "}") }
railroadEbnfText,
railroadAbnfText,
railroadPegText,
+ IshikawaDiagram,
SankeyDiagram,
xyChartText,
packetText,
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
index 3114a7deba..74c22e3d16 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
@@ -4,69 +4,70 @@ export const
frontMatterStart = 1,
FrontMatterContent = 2,
frontMatterEnd = 3,
- preDiagramLine = 50,
+ preDiagramLine = 51,
Directive = 4,
LineComment = 5,
- pieText = 51,
+ pieText = 52,
MindmapDiagram = 6,
- flowchartText = 52,
- sequenceText = 53,
- journeyText = 54,
- requirementText = 55,
- ganttText = 56,
+ flowchartText = 53,
+ sequenceText = 54,
+ journeyText = 55,
+ requirementText = 56,
+ ganttText = 57,
TimelineDiagram = 7,
- quadrantText = 57,
- radarText = 58,
- treemapText = 59,
- treeViewText = 60,
- wardleyText = 61,
- cynefinText = 62,
+ quadrantText = 58,
+ radarText = 59,
+ treemapText = 60,
+ treeViewText = 61,
+ wardleyText = 62,
+ cynefinText = 63,
EventModelingDiagram = 8,
- railroadText = 63,
- railroadEbnfText = 64,
- railroadAbnfText = 65,
- railroadPegText = 66,
- SankeyDiagram = 9,
- xyChartText = 67,
- packetText = 68,
- KanbanDiagram = 10,
- BlockDiagram = 11,
- architectureText = 69,
- classText = 70,
- stateText = 71,
- erText = 72,
- gitText = 73,
- c4Text = 74,
- accTitleKeyword = 12,
- accDescrKeyword = 13,
- AccText = 14,
- accBlockText = 15,
- diagramRest = 75,
- MermaidDiagram = 16,
- FrontMatter = 17,
- PieDiagram = 18,
- AccTitle = 19,
- AccDescr = 21,
- FlowchartDiagram = 24,
- SequenceDiagram = 25,
- JourneyDiagram = 26,
- RequirementDiagram = 27,
- GanttDiagram = 28,
- QuadrantDiagram = 29,
- RadarDiagram = 30,
- TreemapDiagram = 31,
- TreeViewDiagram = 32,
- WardleyDiagram = 33,
- CynefinDiagram = 34,
- RailroadDiagram = 35,
- RailroadEbnfDiagram = 36,
- RailroadAbnfDiagram = 37,
- RailroadPegDiagram = 38,
- XYChartDiagram = 39,
- PacketDiagram = 40,
- ArchitectureDiagram = 41,
- ClassDiagram = 42,
- StateDiagram = 43,
- ERDiagram = 44,
- GitDiagram = 45,
- C4Diagram = 46
+ railroadText = 64,
+ railroadEbnfText = 65,
+ railroadAbnfText = 66,
+ railroadPegText = 67,
+ IshikawaDiagram = 9,
+ SankeyDiagram = 10,
+ xyChartText = 68,
+ packetText = 69,
+ KanbanDiagram = 11,
+ BlockDiagram = 12,
+ architectureText = 70,
+ classText = 71,
+ stateText = 72,
+ erText = 73,
+ gitText = 74,
+ c4Text = 75,
+ accTitleKeyword = 13,
+ accDescrKeyword = 14,
+ AccText = 15,
+ accBlockText = 16,
+ diagramRest = 76,
+ MermaidDiagram = 17,
+ FrontMatter = 18,
+ PieDiagram = 19,
+ AccTitle = 20,
+ AccDescr = 22,
+ FlowchartDiagram = 25,
+ SequenceDiagram = 26,
+ JourneyDiagram = 27,
+ RequirementDiagram = 28,
+ GanttDiagram = 29,
+ QuadrantDiagram = 30,
+ RadarDiagram = 31,
+ TreemapDiagram = 32,
+ TreeViewDiagram = 33,
+ WardleyDiagram = 34,
+ CynefinDiagram = 35,
+ RailroadDiagram = 36,
+ RailroadEbnfDiagram = 37,
+ RailroadAbnfDiagram = 38,
+ RailroadPegDiagram = 39,
+ XYChartDiagram = 40,
+ PacketDiagram = 41,
+ ArchitectureDiagram = 42,
+ ClassDiagram = 43,
+ StateDiagram = 44,
+ ERDiagram = 45,
+ GitDiagram = 46,
+ C4Diagram = 47
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts
index 0fb191ab23..c4e59f9cc2 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts
@@ -5,16 +5,16 @@ import {frontMatter, diagramText, accessibility} from "./tokens.js"
import {mermaidHighlighting} from "./highlight.js"
export const parser = LRParser.deserialize({
version: 14,
- states: "*UO#`QVOOO#gOQO'#CmOOQS'#D]'#D]OVQTOOO#oQXO'#CnO#}QXO'#CtO$]QXO'#CuO$kQXO'#CvO$yQXO'#CwO%XQXO'#CxO%gQXO'#CyO%uQXO'#CzO&TQXO'#C{O&cQXO'#C|O&qQXO'#C}O'PQXO'#DOO'_QXO'#DPO'mQXO'#DQO'{QXO'#DRO(ZQXO'#DSO(iQXO'#DTO(wQXO'#DUO)VQXO'#DVO)eQXO'#DWO)sQXO'#DXO*RQXO'#DYO*aQXO'#DZO*oQXO'#D[QOQPOOOVQTOOOOQS,59X,59XO*}OQO,59XOOQS-E7Z-E7ZO+SQPO'#CoO+XQPO'#CqOOQW'#D|'#D|OOQW'#D^'#D^O+aQXO,59YO+oQXO,59`O+}QXO,59aO,]QXO,59bO,kQXO,59cO,yQXO,59dO-XQXO,59eO-gQXO,59fO-uQXO,59gO.TQXO,59hO.cQXO,59iO.qQXO,59jO/PQXO,59kO/_QXO,59lO/mQXO,59mO/{QXO,59nO0ZQXO,59oO0iQXO,59pO0wQXO,59qO1VQXO,59rO1eQXO,59sO1sQXO,59tO2RQXO,59uO2aQXO,59vOOQS1G.s1G.sO2oQXO,59ZO3QQXO,59]O3cQXO,59]OOQW-E7[-E7[OOQW1G.u1G.uOOQW1G.w1G.wO3kQPO1G.wOOQW7+$c7+$c",
- stateData: "3p~O!oOS~OSQOTQOUlOVlOWlOXlOYlOZlO!SQO!TSO!UTO!VUO!WVO!XWO!YXO!ZYO![ZO!][O!^]O!_^O!`_O!a`O!baO!cbO!dcO!edO!feO!gfO!hgO!ihO!jiO!kjO!lkO~OPPO~PVOQoORnO~O[qO]rO!msO!RbX~O[qO]rO!msO!RhX~O[qO]rO!msO!RiX~O[qO]rO!msO!RjX~O[qO]rO!msO!RkX~O[qO]rO!msO!RlX~O[qO]rO!msO!RmX~O[qO]rO!msO!RnX~O[qO]rO!msO!RoX~O[qO]rO!msO!RpX~O[qO]rO!msO!RqX~O[qO]rO!msO!RrX~O[qO]rO!msO!RsX~O[qO]rO!msO!RtX~O[qO]rO!msO!RuX~O[qO]rO!msO!RvX~O[qO]rO!msO!RwX~O[qO]rO!msO!RxX~O[qO]rO!msO!RyX~O[qO]rO!msO!RzX~O[qO]rO!msO!R{X~O[qO]rO!msO!R|X~O[qO]rO!msO!R}X~O[qO]rO!msO!R!OX~OR!_O~Od!`O~Od!aOf!bO~O[qO]rO!msO!Rba~O[qO]rO!msO!Rha~O[qO]rO!msO!Ria~O[qO]rO!msO!Rja~O[qO]rO!msO!Rka~O[qO]rO!msO!Rla~O[qO]rO!msO!Rma~O[qO]rO!msO!Rna~O[qO]rO!msO!Roa~O[qO]rO!msO!Rpa~O[qO]rO!msO!Rqa~O[qO]rO!msO!Rra~O[qO]rO!msO!Rsa~O[qO]rO!msO!Rta~O[qO]rO!msO!Rua~O[qO]rO!msO!Rva~O[qO]rO!msO!Rwa~O[qO]rO!msO!Rxa~O[qO]rO!msO!Rya~O[qO]rO!msO!Rza~O[qO]rO!msO!R{a~O[qO]rO!msO!R|a~O[qO]rO!msO!R}a~O[qO]rO!msO!R!Oa~O^!dO[ca]ca!Rca!mca~O^!eO[ea]ea!Rea!mea~O_!fOg!eO~Og!gO~O",
- goto: "'a!qPPPPPPPPPPPPPPPPP!r!u!zP!zPP!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u!u$O$VPPPPPPPPPPPPPPPPPPPPPPPPPPPPP&]RmOVlORm#TsSTUVWXYZ[]^_`abcdefghijkuvwxyz{|}!O!P!Q!R!S!T!U!V!W!X!Y!Z![!]!^SROmRpRQuSQvTQwUQxVQyWQzXQ{YQ|ZQ}[Q!O]Q!P^Q!Q_Q!R`Q!SaQ!TbQ!UcQ!VdQ!WeQ!XfQ!YgQ!ZhQ![iQ!]jQ!^k!R!cuvwxyz{|}!O!P!Q!R!S!T!U!V!W!X!Y!Z![!]!^#TtSTUVWXYZ[]^_`abcdefghijkuvwxyz{|}!O!P!Q!R!S!T!U!V!W!X!Y!Z![!]!^",
- nodeNames: "⚠ DashLine FrontMatterContent DashLine Directive LineComment MindmapDiagram TimelineDiagram EventModelingDiagram SankeyDiagram KanbanDiagram BlockDiagram Keyword Keyword AccText AccText MermaidDiagram FrontMatter PieDiagram AccTitle : AccDescr { } FlowchartDiagram SequenceDiagram JourneyDiagram RequirementDiagram GanttDiagram QuadrantDiagram RadarDiagram TreemapDiagram TreeViewDiagram WardleyDiagram CynefinDiagram RailroadDiagram RailroadEbnfDiagram RailroadAbnfDiagram RailroadPegDiagram XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",
- maxTerm: 78,
+ states: "*UO#cQVOOO#jOQO'#CnOOQS'#D^'#D^OVQTOOO#rQXO'#CoO$QQXO'#CuO$`QXO'#CvO$nQXO'#CwO$|QXO'#CxO%[QXO'#CyO%jQXO'#CzO%xQXO'#C{O&WQXO'#C|O&fQXO'#C}O&tQXO'#DOO'SQXO'#DPO'bQXO'#DQO'pQXO'#DRO(OQXO'#DSO(^QXO'#DTO(lQXO'#DUO(zQXO'#DVO)YQXO'#DWO)hQXO'#DXO)vQXO'#DYO*UQXO'#DZO*dQXO'#D[O*rQXO'#D]QOQPOOOVQTOOOOQS,59Y,59YO+QOQO,59YOOQS-E7[-E7[O+VQPO'#CpO+[QPO'#CrOOQW'#D}'#D}OOQW'#D_'#D_O+dQXO,59ZO+rQXO,59aO,QQXO,59bO,`QXO,59cO,nQXO,59dO,|QXO,59eO-[QXO,59fO-jQXO,59gO-xQXO,59hO.WQXO,59iO.fQXO,59jO.tQXO,59kO/SQXO,59lO/bQXO,59mO/pQXO,59nO0OQXO,59oO0^QXO,59pO0lQXO,59qO0zQXO,59rO1YQXO,59sO1hQXO,59tO1vQXO,59uO2UQXO,59vO2dQXO,59wOOQS1G.t1G.tO2rQXO,59[O3TQXO,59^O3fQXO,59^OOQW-E7]-E7]OOQW1G.v1G.vOOQW1G.x1G.xO3nQPO1G.xOOQW7+$d7+$d",
+ stateData: "3s~O!pOS~OSQOTQOUlOVlOWlOXlOYlOZlO[lO!TQO!USO!VTO!WUO!XVO!YWO!ZXO![YO!]ZO!^[O!_]O!`^O!a_O!b`O!caO!dbO!ecO!fdO!geO!hfO!igO!jhO!kiO!ljO!mkO~OPPO~PVOQoORnO~O]qO^rO!nsO!ScX~O]qO^rO!nsO!SiX~O]qO^rO!nsO!SjX~O]qO^rO!nsO!SkX~O]qO^rO!nsO!SlX~O]qO^rO!nsO!SmX~O]qO^rO!nsO!SnX~O]qO^rO!nsO!SoX~O]qO^rO!nsO!SpX~O]qO^rO!nsO!SqX~O]qO^rO!nsO!SrX~O]qO^rO!nsO!SsX~O]qO^rO!nsO!StX~O]qO^rO!nsO!SuX~O]qO^rO!nsO!SvX~O]qO^rO!nsO!SwX~O]qO^rO!nsO!SxX~O]qO^rO!nsO!SyX~O]qO^rO!nsO!SzX~O]qO^rO!nsO!S{X~O]qO^rO!nsO!S|X~O]qO^rO!nsO!S}X~O]qO^rO!nsO!S!OX~O]qO^rO!nsO!S!PX~OR!_O~Oe!`O~Oe!aOg!bO~O]qO^rO!nsO!Sca~O]qO^rO!nsO!Sia~O]qO^rO!nsO!Sja~O]qO^rO!nsO!Ska~O]qO^rO!nsO!Sla~O]qO^rO!nsO!Sma~O]qO^rO!nsO!Sna~O]qO^rO!nsO!Soa~O]qO^rO!nsO!Spa~O]qO^rO!nsO!Sqa~O]qO^rO!nsO!Sra~O]qO^rO!nsO!Ssa~O]qO^rO!nsO!Sta~O]qO^rO!nsO!Sua~O]qO^rO!nsO!Sva~O]qO^rO!nsO!Swa~O]qO^rO!nsO!Sxa~O]qO^rO!nsO!Sya~O]qO^rO!nsO!Sza~O]qO^rO!nsO!S{a~O]qO^rO!nsO!S|a~O]qO^rO!nsO!S}a~O]qO^rO!nsO!S!Oa~O]qO^rO!nsO!S!Pa~O_!dO]da^da!Sda!nda~O_!eO]fa^fa!Sfa!nfa~O`!fOh!eO~Oh!gO~O",
+ goto: "'b!rPPPPPPPPPPPPPPPPPP!s!v!{P!{PP!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v!v$P$WPPPPPPPPPPPPPPPPPPPPPPPPPPPPP&^RmOVlORm#TsSTUVWXYZ[]^_`abcdefghijkuvwxyz{|}!O!P!Q!R!S!T!U!V!W!X!Y!Z![!]!^SROmRpRQuSQvTQwUQxVQyWQzXQ{YQ|ZQ}[Q!O]Q!P^Q!Q_Q!R`Q!SaQ!TbQ!UcQ!VdQ!WeQ!XfQ!YgQ!ZhQ![iQ!]jQ!^k!R!cuvwxyz{|}!O!P!Q!R!S!T!U!V!W!X!Y!Z![!]!^#TtSTUVWXYZ[]^_`abcdefghijkuvwxyz{|}!O!P!Q!R!S!T!U!V!W!X!Y!Z![!]!^",
+ nodeNames: "⚠ DashLine FrontMatterContent DashLine Directive LineComment MindmapDiagram TimelineDiagram EventModelingDiagram IshikawaDiagram SankeyDiagram KanbanDiagram BlockDiagram Keyword Keyword AccText AccText MermaidDiagram FrontMatter PieDiagram AccTitle : AccDescr { } FlowchartDiagram SequenceDiagram JourneyDiagram RequirementDiagram GanttDiagram QuadrantDiagram RadarDiagram TreemapDiagram TreeViewDiagram WardleyDiagram CynefinDiagram RailroadDiagram RailroadEbnfDiagram RailroadAbnfDiagram RailroadPegDiagram XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",
+ maxTerm: 79,
propSources: [mermaidHighlighting],
skippedNodes: [0],
repeatNodeCount: 2,
- tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!o~XYe]^epqe~xOd~~}Of~~!SOg~",
+ tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!p~XYe]^epqe~xOe~~}Og~~!SOh~",
tokenizers: [0, frontMatter, diagramText, accessibility],
- topRules: {"MermaidDiagram":[0,16]},
+ topRules: {"MermaidDiagram":[0,17]},
tokenPrec: 0
})
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
index 9a490c887c..9e55cc4016 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
@@ -29,6 +29,7 @@ import {
railroadEbnfText,
railroadAbnfText,
railroadPegText,
+ IshikawaDiagram,
SankeyDiagram,
xyChartText,
packetText,
@@ -70,6 +71,8 @@ const diagramMap: Record<string, number> = {
"railroad-ebnf-beta": railroadEbnfText,
"railroad-abnf-beta": railroadAbnfText,
"railroad-peg-beta": railroadPegText,
+ "ishikawa-beta": IshikawaDiagram,
+ "ishikawa": IshikawaDiagram,
"sankey-beta": SankeyDiagram,
"sankey": SankeyDiagram,
"xychart-beta": xyChartText,
diff --git a/packages/codemirror/src/languages/mermaid/tags/index.ts b/packages/codemirror/src/languages/mermaid/tags/index.ts
index 454a0ffcde..6cf918d48a 100644
--- a/packages/codemirror/src/languages/mermaid/tags/index.ts
+++ b/packages/codemirror/src/languages/mermaid/tags/index.ts
@@ -306,3 +306,10 @@ export const railroadTags = {
string: Tag.define(t.string),
titleText: Tag.define(t.string)
};
+
+export const ishikawaTags = {
+ category: Tag.define(t.keyword),
+ diagramName: Tag.define(mermaidTags.diagramName),
+ effect: Tag.define(t.heading),
+ lineComment: Tag.define(t.lineComment)
+};
diff --git a/packages/codemirror/src/languages/mermaid/test/ishikawa.txt b/packages/codemirror/src/languages/mermaid/test/ishikawa.txt
new file mode 100644
index 0000000000..eb393a5cd8
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/test/ishikawa.txt
@@ -0,0 +1,48 @@
+# Ishikawa
+
+ishikawa-beta
+
+==>
+
+IshikawaDiagram(DiagramName)
+
+# Trilium's sample
+
+ishikawa-beta
+ Blurry Photo
+ Process
+ Out of focus
+ Shutter speed too slow
+ User
+ Shaky hands
+ Equipment
+ LENS
+ Inappropriate lens
+ SENSOR
+ Damaged sensor
+
+==>
+
+IshikawaDiagram(DiagramName,Effect,Category,Cause,Cause,Category,Cause,Category,Cause,Cause,Cause,Cause)
+
+# Effect on the diagram line and a shallower category
+
+ishikawa Blurry
+ Process
+ cause
+ Less indented
+
+==>
+
+IshikawaDiagram(DiagramName,Effect,Category,Cause,Category)
+
+# Comments
+
+ishikawa-beta
+ Effect %% stays text
+ %% a comment
+ Category
+
+==>
+
+IshikawaDiagram(DiagramName,Effect,LineComment,Category)
diff --git a/packages/codemirror/src/languages/mermaid/test/mermaid.txt b/packages/codemirror/src/languages/mermaid/test/mermaid.txt
index 2d84c816e3..298329ec64 100644
--- a/packages/codemirror/src/languages/mermaid/test/mermaid.txt
+++ b/packages/codemirror/src/languages/mermaid/test/mermaid.txt
@@ -458,3 +458,12 @@ railroad-peg-beta
==>
MermaidDiagram(RailroadPegDiagram(DiagramName,Rule(RuleName,"<-",String,";")))
+
+# Ishikawa
+
+ishikawa-beta
+ Effect
+
+==>
+
+MermaidDiagram(IshikawaDiagram(DiagramName,Effect))