Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
feat(codemirror): highlight Mermaid tree views
Elian Doran999a8f7b251d
diff --git a/packages/codemirror/src/languages/mermaid/index.ts b/packages/codemirror/src/languages/mermaid/index.tsindex 38aef9aeac..0bcf622c5c 100644--- a/packages/codemirror/src/languages/mermaid/index.ts+++ b/packages/codemirror/src/languages/mermaid/index.ts@@ -29,6 +29,7 @@ import { parser as sequenceParser } from "./parsers/sequence/parser.js";import { parser as stateParser } from "./parsers/state/parser.js";import { parser as timelineParser } from "./parsers/timeline/parser.js";import { parser as treemapParser } from "./parsers/treemap/parser.js";+import { parser as treeViewParser } from "./parsers/treeview/parser.js";import { parser as xychartParser } from "./parsers/xychart/parser.js";export { foldByIndent } from "./extensions/index.js";@@ -60,6 +61,7 @@ export const DIAGRAM_PARSERS: Record<string, LRParser> = {StateDiagram: stateParser,TimelineDiagram: timelineParser,TreemapDiagram: treemapParser,+ TreeViewDiagram: treeViewParser,XYChartDiagram: xychartParser};diff --git a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts b/packages/codemirror/src/languages/mermaid/mermaid.spec.tsindex 8a8b5eb729..7a74c71356 100644--- a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts+++ b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts@@ -115,7 +115,8 @@ describe("accessibility lines", () => {"requirementDiagram\n requirement r {\n id: 1\n }", "C4Context\n Person(a, \"A\")","quadrantChart\n x-axis A --> B", "xychart-beta\n bar [1, 2]","packet-beta\n 0-15: \"A\"", "architecture-beta\n service a(server)[A]",- "radar-beta\n axis a", "treemap-beta\n \"A\": 1"+ "radar-beta\n axis a", "treemap-beta\n \"A\": 1",+ "treeView-beta\n src"];const lines = [" accTitle: My title", " accDescr: My description", " accDescr {\n Line one\n }"diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammarindex a3c04e1ed6..277fcbcdb7 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar@@ -16,6 +16,7 @@QuadrantDiagram |RadarDiagram |TreemapDiagram |+ TreeViewDiagram |SankeyDiagram |XYChartDiagram |PacketDiagram |@@ -39,6 +40,7 @@ GanttDiagram { ganttText accessible* }QuadrantDiagram { quadrantText accessible* }RadarDiagram { radarText accessible* }TreemapDiagram { treemapText accessible* }+TreeViewDiagram { treeViewText accessible* }XYChartDiagram { xyChartText accessible* }PacketDiagram { packetText accessible* }ArchitectureDiagram { architectureText accessible* }@@ -88,6 +90,7 @@ AccDescr { accDescrKeyword (":" AccText? | "{" accBlockText? "}") }quadrantText,radarText,treemapText,+ treeViewText,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.tsindex 9f585828d8..b6ac1170d5 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts@@ -4,36 +4,37 @@ export constfrontMatterStart = 1,FrontMatterContent = 2,frontMatterEnd = 3,- preDiagramLine = 42,+ preDiagramLine = 43,Directive = 4,LineComment = 5,- pieText = 43,+ pieText = 44,MindmapDiagram = 6,- flowchartText = 44,- sequenceText = 45,- journeyText = 46,- requirementText = 47,- ganttText = 48,+ flowchartText = 45,+ sequenceText = 46,+ journeyText = 47,+ requirementText = 48,+ ganttText = 49,TimelineDiagram = 7,- quadrantText = 49,- radarText = 50,- treemapText = 51,+ quadrantText = 50,+ radarText = 51,+ treemapText = 52,+ treeViewText = 53,SankeyDiagram = 8,- xyChartText = 52,- packetText = 53,+ xyChartText = 54,+ packetText = 55,KanbanDiagram = 9,BlockDiagram = 10,- architectureText = 54,- classText = 55,- stateText = 56,- erText = 57,- gitText = 58,- c4Text = 59,+ architectureText = 56,+ classText = 57,+ stateText = 58,+ erText = 59,+ gitText = 60,+ c4Text = 61,accTitleKeyword = 11,accDescrKeyword = 12,AccText = 13,accBlockText = 14,- diagramRest = 60,+ diagramRest = 62,MermaidDiagram = 15,FrontMatter = 16,PieDiagram = 17,@@ -47,11 +48,12 @@ export constQuadrantDiagram = 28,RadarDiagram = 29,TreemapDiagram = 30,- XYChartDiagram = 31,- PacketDiagram = 32,- ArchitectureDiagram = 33,- ClassDiagram = 34,- StateDiagram = 35,- ERDiagram = 36,- GitDiagram = 37,- C4Diagram = 38+ TreeViewDiagram = 31,+ XYChartDiagram = 32,+ PacketDiagram = 33,+ ArchitectureDiagram = 34,+ ClassDiagram = 35,+ StateDiagram = 36,+ ERDiagram = 37,+ GitDiagram = 38,+ C4Diagram = 39diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.tsindex d85927bd9e..81c702eb08 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts@@ -5,15 +5,15 @@ import {frontMatter, diagramText, accessibility} from "./tokens.js"import {mermaidHighlighting} from "./highlight.js"export const parser = LRParser.deserialize({version: 14,- states: "(^O!vQVOOO!}OQO'#ClOOQS'#DT'#DTOVQTOOO#VQXO'#CmO#eQXO'#CsO#sQXO'#CtO$RQXO'#CuO$aQXO'#CvO$oQXO'#CwO$}QXO'#CxO%]QXO'#CyO%kQXO'#CzO%yQXO'#C{O&XQXO'#C|O&gQXO'#C}O&uQXO'#DOO'TQXO'#DPO'cQXO'#DQO'qQXO'#DRO(PQXO'#DSQOQPOOOVQTOOOOQS,59W,59WO(_OQO,59WOOQS-E7R-E7RO(dQPO'#CnO(iQPO'#CpOOQW'#Dm'#DmOOQW'#DU'#DUO(qQXO,59XO)PQXO,59_O)_QXO,59`O)mQXO,59aO){QXO,59bO*ZQXO,59cO*iQXO,59dO*wQXO,59eO+VQXO,59fO+eQXO,59gO+sQXO,59hO,RQXO,59iO,aQXO,59jO,oQXO,59kO,}QXO,59lO-]QXO,59mO-kQXO,59nOOQS1G.r1G.rO-yQXO,59YO.[QXO,59[O.mQXO,59[OOQW-E7S-E7SOOQW1G.t1G.tOOQW1G.v1G.vO.uQPO1G.vOOQW7+$b7+$b",- stateData: ".z~O!`OS~OSQOTQOUeOVeOWeOXeOYeOzQO{SO|TO}UO!OVO!PWO!QXO!RYO!SZO!T[O!U]O!V^O!W_O!X`O!YaO!ZbO![cO!]dO~OPPO~PVOQhORgO~OZjO[kO!^lOyaX~OZjO[kO!^lOygX~OZjO[kO!^lOyhX~OZjO[kO!^lOyiX~OZjO[kO!^lOyjX~OZjO[kO!^lOykX~OZjO[kO!^lOylX~OZjO[kO!^lOymX~OZjO[kO!^lOynX~OZjO[kO!^lOyoX~OZjO[kO!^lOypX~OZjO[kO!^lOyqX~OZjO[kO!^lOyrX~OZjO[kO!^lOysX~OZjO[kO!^lOytX~OZjO[kO!^lOyuX~OZjO[kO!^lOyvX~OR!PO~Oc!QO~Oc!ROe!SO~OZjO[kO!^lOyaa~OZjO[kO!^lOyga~OZjO[kO!^lOyha~OZjO[kO!^lOyia~OZjO[kO!^lOyja~OZjO[kO!^lOyka~OZjO[kO!^lOyla~OZjO[kO!^lOyma~OZjO[kO!^lOyna~OZjO[kO!^lOyoa~OZjO[kO!^lOypa~OZjO[kO!^lOyqa~OZjO[kO!^lOyra~OZjO[kO!^lOysa~OZjO[kO!^lOyta~OZjO[kO!^lOyua~OZjO[kO!^lOyva~O]!UOZba[bayba!^ba~O]!VOZda[dayda!^da~O^!WOf!VO~Of!XO~O",- goto: "%v!bPPPPPPPPPPPPPPPP!c!f!kP!kPP!f!f!f!f!f!f!f!f!f!f!f!f!f!f!f!f#a#hPPPPPPPPPPPPPPPPPPPPPP%QRfOVeORf!glSTUVWXYZ[]^_`abcdnopqrstuvwxyz{|}!OSROfRiRQnSQoTQpUQqVQrWQsXQtYQuZQv[Qw]Qx^Qy_Qz`Q{aQ|bQ}cQ!Ods!Tnopqrstuvwxyz{|}!O!gmSTUVWXYZ[]^_`abcdnopqrstuvwxyz{|}!O",- nodeNames: "⚠ DashLine FrontMatterContent DashLine Directive LineComment MindmapDiagram TimelineDiagram SankeyDiagram KanbanDiagram BlockDiagram Keyword Keyword AccText AccText MermaidDiagram FrontMatter PieDiagram AccTitle : AccDescr { } FlowchartDiagram SequenceDiagram JourneyDiagram RequirementDiagram GanttDiagram QuadrantDiagram RadarDiagram TreemapDiagram XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",- maxTerm: 63,+ states: "(jO!yQVOOO#QOQO'#ClOOQS'#DU'#DUOVQTOOO#YQXO'#CmO#hQXO'#CsO#vQXO'#CtO$UQXO'#CuO$dQXO'#CvO$rQXO'#CwO%QQXO'#CxO%`QXO'#CyO%nQXO'#CzO%|QXO'#C{O&[QXO'#C|O&jQXO'#C}O&xQXO'#DOO'WQXO'#DPO'fQXO'#DQO'tQXO'#DRO(SQXO'#DSO(bQXO'#DTQOQPOOOVQTOOOOQS,59W,59WO(pOQO,59WOOQS-E7S-E7SO(uQPO'#CnO(zQPO'#CpOOQW'#Do'#DoOOQW'#DV'#DVO)SQXO,59XO)bQXO,59_O)pQXO,59`O*OQXO,59aO*^QXO,59bO*lQXO,59cO*zQXO,59dO+YQXO,59eO+hQXO,59fO+vQXO,59gO,UQXO,59hO,dQXO,59iO,rQXO,59jO-QQXO,59kO-`QXO,59lO-nQXO,59mO-|QXO,59nO.[QXO,59oOOQS1G.r1G.rO.jQXO,59YO.{QXO,59[O/^QXO,59[OOQW-E7T-E7TOOQW1G.t1G.tOOQW1G.v1G.vO/fQPO1G.vOOQW7+$b7+$b",+ stateData: "/k~O!bOS~OSQOTQOUfOVfOWfOXfOYfO{QO|SO}TO!OUO!PVO!QWO!RXO!SYO!TZO!U[O!V]O!W^O!X_O!Y`O!ZaO![bO!]cO!^dO!_eO~OPPO~PVOQiORhO~OZkO[lO!`mOzaX~OZkO[lO!`mOzgX~OZkO[lO!`mOzhX~OZkO[lO!`mOziX~OZkO[lO!`mOzjX~OZkO[lO!`mOzkX~OZkO[lO!`mOzlX~OZkO[lO!`mOzmX~OZkO[lO!`mOznX~OZkO[lO!`mOzoX~OZkO[lO!`mOzpX~OZkO[lO!`mOzqX~OZkO[lO!`mOzrX~OZkO[lO!`mOzsX~OZkO[lO!`mOztX~OZkO[lO!`mOzuX~OZkO[lO!`mOzvX~OZkO[lO!`mOzwX~OR!RO~Oc!SO~Oc!TOe!UO~OZkO[lO!`mOzaa~OZkO[lO!`mOzga~OZkO[lO!`mOzha~OZkO[lO!`mOzia~OZkO[lO!`mOzja~OZkO[lO!`mOzka~OZkO[lO!`mOzla~OZkO[lO!`mOzma~OZkO[lO!`mOzna~OZkO[lO!`mOzoa~OZkO[lO!`mOzpa~OZkO[lO!`mOzqa~OZkO[lO!`mOzra~OZkO[lO!`mOzsa~OZkO[lO!`mOzta~OZkO[lO!`mOzua~OZkO[lO!`mOzva~OZkO[lO!`mOzwa~O]!WOZba[bazba!`ba~O]!XOZda[dazda!`da~O^!YOf!XO~Of!ZO~O",+ goto: "&Q!dPPPPPPPPPPPPPPPP!e!h!mP!mPP!h!h!h!h!h!h!h!h!h!h!h!h!h!h!h!h!h#e#lPPPPPPPPPPPPPPPPPPPPPPP%YRgOVfORg!kmSTUVWXYZ[]^_`abcdeopqrstuvwxyz{|}!O!P!QSROgRjRQoSQpTQqUQrVQsWQtXQuYQvZQw[Qx]Qy^Qz_Q{`Q|aQ}bQ!OcQ!PdQ!Qeu!Vopqrstuvwxyz{|}!O!P!Q!knSTUVWXYZ[]^_`abcdeopqrstuvwxyz{|}!O!P!Q",+ nodeNames: "⚠ DashLine FrontMatterContent DashLine Directive LineComment MindmapDiagram TimelineDiagram SankeyDiagram KanbanDiagram BlockDiagram Keyword Keyword AccText AccText MermaidDiagram FrontMatter PieDiagram AccTitle : AccDescr { } FlowchartDiagram SequenceDiagram JourneyDiagram RequirementDiagram GanttDiagram QuadrantDiagram RadarDiagram TreemapDiagram TreeViewDiagram XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",+ maxTerm: 65,propSources: [mermaidHighlighting],skippedNodes: [0],repeatNodeCount: 2,- tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!`~XYe]^epqe~xOc~~}Oe~~!SOf~",+ tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!b~XYe]^epqe~xOc~~}Oe~~!SOf~",tokenizers: [0, frontMatter, diagramText, accessibility],topRules: {"MermaidDiagram":[0,15]},tokenPrec: 0diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.tsindex 8043ea56d1..9967b90b57 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts@@ -21,6 +21,7 @@ import {quadrantText,radarText,treemapText,+ treeViewText,SankeyDiagram,xyChartText,packetText,@@ -54,6 +55,7 @@ const diagramMap: Record<string, number> = {"radar-beta": radarText,"treemap-beta": treemapText,"treemap": treemapText,+ "treeView-beta": treeViewText,"sankey-beta": SankeyDiagram,"sankey": SankeyDiagram,"xychart-beta": xyChartText,@@ -84,8 +86,8 @@ const diagrams = Object.keys(diagramMap);// lines as content; mindmap, sankey and block reject them.const accessibleDiagrams = new Set([pieText, flowchartText, sequenceText, journeyText, requirementText, ganttText, quadrantText,- radarText, treemapText, xyChartText, packetText, architectureText, classText, stateText, erText,- gitText, c4Text+ radarText, treemapText, treeViewText, xyChartText, packetText, architectureText, classText,+ stateText, erText, gitText, c4Text]);/**diff --git a/packages/codemirror/src/languages/mermaid/parsers/treeview/highlight.ts b/packages/codemirror/src/languages/mermaid/parsers/treeview/highlight.tsnew file mode 100644index 0000000000..09218b1704--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treeview/highlight.ts@@ -0,0 +1,14 @@+import { styleTags } from "@lezer/highlight";++import { treeViewTags } from "../../tags/index.js";++export const treeViewHighlighting = styleTags({+ "ClassAnnotation": treeViewTags.className,+ "Description": treeViewTags.description,+ "DiagramName": treeViewTags.diagramName,+ "Icon": treeViewTags.icon,+ "Keyword": treeViewTags.keyword,+ "LineComment": treeViewTags.lineComment,+ "Name String": treeViewTags.name,+ "TitleText": treeViewTags.titleText+});diff --git a/packages/codemirror/src/languages/mermaid/parsers/treeview/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/treeview/parser.terms.tsnew file mode 100644index 0000000000..fd4af0a601--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treeview/parser.terms.ts@@ -0,0 +1,15 @@+// 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+ TitleText = 1,+ titleKeyword = 2,+ Name = 3,+ LineComment = 4,+ TreeViewDiagram = 5,+ DiagramName = 6,+ Title = 7,+ Node = 8,+ String = 9,+ ClassAnnotation = 10,+ Icon = 11,+ Description = 12diff --git a/packages/codemirror/src/languages/mermaid/parsers/treeview/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/treeview/parser.tsnew file mode 100644index 0000000000..84a14cc614--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treeview/parser.ts@@ -0,0 +1,20 @@+// 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 {titleText, names} from "./tokens.js"+import {treeViewHighlighting} from "./highlight.js"+export const parser = LRParser.deserialize({+ version: 14,+ states: "!|OYQSOOOOQQ'#Cb'#CbQ_QUOOOjQVO'#CcOOQQ'#Ci'#CiQ_QUOOO{QUO'#CdOOQQ'#Cj'#CjQbQUOOOOQQ,58},58}OOQQ-E6g-E6gOOQQ'#Ck'#CkO!aQUO,59OOOQQ-E6h-E6hOOQQ-E6i-E6i",+ stateData: "!u~ObOSSOS~OcPO~OQRORUOXUO~OPXOQVXRVXXVX`VX~OYZOZZO[ZORWXXWX`WX~OYZOZZO[ZORWaXWa`Wa~O",+ goto: "!Q`PPPPPPadhPPPPmszRQOTSQTVVQTWQTQRYTSWQTR]WQ[UR^[",+ nodeNames: "⚠ TitleText Keyword Name LineComment TreeViewDiagram DiagramName Title Node String ClassAnnotation Icon Description",+ maxTerm: 19,+ propSources: [treeViewHighlighting],+ skippedNodes: [0,4],+ repeatNodeCount: 3,+ tokenData: ")e~RZXYtYZt]^tpqtrs!Vst!wuv#fwx$T![!]$p#]#^%t#h#i't~ySb~XYtYZt]^tpqt~!YUOY!VZr!Vrs!ls;'S!V;'S;=`!q<%lO!V~!qOX~~!tP;=`<%l!V~!zPst!}~#SS[~OY!}Z;'S!};'S;=`#`<%lO!}~#cP;=`<%l!}~#iPuv#l~#qSS~OY#lZ;'S#l;'S;=`#}<%lO#l~$QP;=`<%l#l~$WUOY$TZw$Twx!lx;'S$T;'S;=`$j<%lO$T~$mP;=`<%l$T~$sP![!]$v~$yP![!]$|~%PTXY$|pq$|!c!}%`#R#S%`#T#o%`~%eTY~}!O%`!Q![%`!c!}%`#R#S%`#T#o%`~%wP#V#W%z~%}P#c#d&Q~&TP#b#c&W~&ZPxy&^~&aVyz&v}!O&^!Q![&^![!]&{!c!}&^#R#S&^#T#o&^~&{OZ~~'OT}!O'_!Q!['_!c!}'_#R#S'_#T#o'_~'bUyz&v}!O'_!Q!['_!c!}'_#R#S'_#T#o'_~'wP#f#g'z~'}P#X#Y(Q~(TP#X#Y(W~(ZP!x!y(^~(aP#]#^(d~(gP#X#Y(j~(mP#k#l(p~(sP}!O(v~(yP#U#V(|~)PP#X#Y)S~)VP#h#i)Y~)]P#T#U)`~)eOc~",+ tokenizers: [titleText, names, 0],+ topRules: {"TreeViewDiagram":[0,5]},+ tokenPrec: 0+})diff --git a/packages/codemirror/src/languages/mermaid/parsers/treeview/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/treeview/tokens.tsnew file mode 100644index 0000000000..badf647115--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treeview/tokens.ts@@ -0,0 +1,52 @@+import { ExternalTokenizer, type InputStream } from "@lezer/lr";++import { lineText } from "../line_text.js";+import { Name, titleKeyword, TitleText } from "./parser.terms.js";++const whitespace = [ 9, 13, 32 ];++/**+ * A `title` keyword before the first node, or a bare node name, both only at the start of a line.+ * A bare name runs to the line's end, stopping before whitespace that opens an annotation: `:::`+ * with a class name, `icon(` or `##`. Quoted names and whole-line `%%` comments are left to the+ * grammar's tokens.+ */+export const names = new ExternalTokenizer((input, stack) => {+ const next = input.next;+ if ([ -1, 10, 34, 39, ...whitespace ].includes(next)) return;+ if (next === 37 && input.peek(1) === 37) return;+ let before = -1;+ while (whitespace.includes(input.peek(before))) before--;+ if (input.peek(before) !== 10) return;++ if (stack.canShift(titleKeyword) && startsWith(input, 0, "title")+ && [ ...whitespace, 10, -1 ].includes(input.peek(5))) {+ input.acceptToken(titleKeyword, 5);+ return;+ }++ let length = 1;+ while (![ 10, -1 ].includes(input.peek(length)) && !opensAnnotation(input, length)) length++;+ input.acceptToken(Name, length);+});++export const titleText = lineText(TitleText);++function opensAnnotation(input: InputStream, offset: number) {+ if (!whitespace.includes(input.peek(offset))) return false;+ let start = offset;+ while (whitespace.includes(input.peek(start))) start++;+ if (startsWith(input, start, "icon(") || startsWith(input, start, "##")) return true;+ if (!startsWith(input, start, ":::")) return false;+ start += 3;+ while (whitespace.includes(input.peek(start))) start++;+ const first = input.peek(start);+ return first === 95 || (first >= 65 && first <= 90) || (first >= 97 && first <= 122);+}++function startsWith(input: InputStream, offset: number, text: string) {+ for (let index = 0; index < text.length; index++) {+ if (input.peek(offset + index) !== text.charCodeAt(index)) return false;+ }+ return true;+}diff --git a/packages/codemirror/src/languages/mermaid/parsers/treeview/treeview.grammar b/packages/codemirror/src/languages/mermaid/parsers/treeview/treeview.grammarnew file mode 100644index 0000000000..c9c9de75b5--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treeview/treeview.grammar@@ -0,0 +1,30 @@+// Follows the Langium grammar of Mermaid's tree view (`@mermaid-js/parser`). Mermaid nests nodes+// by their indentation; highlighting reads each line on its own, so newlines and indentation are+// skipped. A `title` comes before the first node.+@top TreeViewDiagram { DiagramName Title* Node* }++Title { titleKeyword TitleText? }++Node { (String | Name) (ClassAnnotation | Icon | Description)* }++DiagramName { "treeView-beta" }++@skip { space | LineComment }++// `titleText` comes first: it takes only the rest of a `title` line, which `names` would read as a+// node name.+@external tokens titleText from "./tokens.js" { TitleText }++@external tokens names from "./tokens.js" { titleKeyword[@name=Keyword], Name }++@tokens {+ space { $[ \t\r\n]+ }+ word { $[a-zA-Z0-9_\-] }+ String { '"' !["\n]* '"' | "'" !['\n]* "'" }+ ClassAnnotation { ":::" $[ \t]* $[a-zA-Z_] word* }+ Icon { "icon(" word* (":" word+)? ")" }+ Description { "##" ![\n]* }+ LineComment { "%%" ![\n]* }+}++@external propSource treeViewHighlighting from "./highlight.js"diff --git a/packages/codemirror/src/languages/mermaid/tags/index.ts b/packages/codemirror/src/languages/mermaid/tags/index.tsindex 42a560b634..f8896fe325 100644--- a/packages/codemirror/src/languages/mermaid/tags/index.ts+++ b/packages/codemirror/src/languages/mermaid/tags/index.ts@@ -241,3 +241,14 @@ export const treemapTags = {styles: Tag.define(t.attributeValue),titleText: Tag.define(t.string)};++export const treeViewTags = {+ className: Tag.define(t.className),+ description: Tag.define(t.docComment),+ diagramName: Tag.define(mermaidTags.diagramName),+ icon: Tag.define(t.atom),+ keyword: Tag.define(t.keyword),+ lineComment: Tag.define(t.lineComment),+ name: Tag.define(t.string),+ titleText: Tag.define(t.string)+};diff --git a/packages/codemirror/src/languages/mermaid/test/mermaid.txt b/packages/codemirror/src/languages/mermaid/test/mermaid.txtindex bb76d66ccb..fbb789de34 100644--- a/packages/codemirror/src/languages/mermaid/test/mermaid.txt+++ b/packages/codemirror/src/languages/mermaid/test/mermaid.txt@@ -386,3 +386,12 @@ treemap==>MermaidDiagram(TreemapDiagram(DiagramName,Leaf(String,":",Number)))++# Tree view++treeView-beta+ src++==>++MermaidDiagram(TreeViewDiagram(DiagramName,Node(Name)))diff --git a/packages/codemirror/src/languages/mermaid/test/treeview.txt b/packages/codemirror/src/languages/mermaid/test/treeview.txtnew file mode 100644index 0000000000..2079008178--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/test/treeview.txt@@ -0,0 +1,76 @@+# Tree view++treeView-beta++==>++TreeViewDiagram(DiagramName)++# Trilium's sample++treeView-beta+ "src"+ "components"+ "Button.tsx"+ "index.ts"+ "README.md"++==>++TreeViewDiagram(DiagramName,Node(String),Node(String),Node(String),Node(String),Node(String))++# Bare names with annotations++treeView-beta+ title Files %% a comment+ src folder+ my file.ts :::hot icon(mdi:file) ## The entry point+ "quoted" ## Described++==>++TreeViewDiagram(DiagramName,Title(Keyword,TitleText),LineComment,+ Node(Name),+ Node(Name,ClassAnnotation,Icon,Description),+ Node(String,Description))++# Annotation markers without whitespace or a class are part of the name++treeView-beta+ a##b+ c :::+ %% a comment line+ d %% stays in the name++==>++TreeViewDiagram(DiagramName,Node(Name),Node(Name),LineComment,Node(Name))++# Title after a node (invalid, parses as a node)++treeView-beta+ src+ title Files++==>++TreeViewDiagram(DiagramName,Node(Name),Node(Name))++# Node on the diagram line (invalid)++treeView-beta src++==>++TreeViewDiagram(DiagramName,Title(⚠,TitleText))++# Each annotation ending a bare name++treeView-beta+ a file icon(mdi:file)+ b file ## Described+ c file ::: hot++==>++TreeViewDiagram(DiagramName,Node(Name,Icon),Node(Name,Description),Node(Name,ClassAnnotation))