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 treemaps
Elian Doran51ae33770c7f
diff --git a/packages/codemirror/src/languages/mermaid/index.ts b/packages/codemirror/src/languages/mermaid/index.tsindex cc198acf2f..38aef9aeac 100644--- a/packages/codemirror/src/languages/mermaid/index.ts+++ b/packages/codemirror/src/languages/mermaid/index.ts@@ -28,6 +28,7 @@ import { parser as sankeyParser } from "./parsers/sankey/parser.js";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 xychartParser } from "./parsers/xychart/parser.js";export { foldByIndent } from "./extensions/index.js";@@ -58,6 +59,7 @@ export const DIAGRAM_PARSERS: Record<string, LRParser> = {SequenceDiagram: sequenceParser,StateDiagram: stateParser,TimelineDiagram: timelineParser,+ TreemapDiagram: treemapParser,XYChartDiagram: xychartParser};diff --git a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts b/packages/codemirror/src/languages/mermaid/mermaid.spec.tsindex 250f12c9ab..8a8b5eb729 100644--- a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts+++ b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts@@ -115,7 +115,7 @@ 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"+ "radar-beta\n axis a", "treemap-beta\n \"A\": 1"];const lines = [" accTitle: My title", " accDescr: My description", " accDescr {\n Line one\n }"@@ -172,6 +172,18 @@ describe("radar grammar", () => {});});+describe("treemap grammar", () => {+ it("ends the styles of a classDef before its semicolon and the spaces around them", () => {+ const doc = "treemap\nclassDef hot fill:#f00 ;\nclassDef cold\n\"A\": 1";+ const tree = parserOf("treemap").parse(doc);+ const styles = tree.topNode.getChildren("ClassDef").map((classDef) => {+ const text = classDef.getChild("Styles");+ return text && doc.slice(text.from, text.to);+ });+ expect(styles).toEqual([ "fill:#f00", null ]);+ });+});+describe("foldByIndent", () => {function foldAt(doc: string, lineNumber: number) {const state = EditorState.create({ doc, extensions: [ foldByIndent() ] });diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammarindex 40c13db4dd..a3c04e1ed6 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar@@ -15,6 +15,7 @@TimelineDiagram |QuadrantDiagram |RadarDiagram |+ TreemapDiagram |SankeyDiagram |XYChartDiagram |PacketDiagram |@@ -37,6 +38,7 @@ RequirementDiagram { requirementText accessible* }GanttDiagram { ganttText accessible* }QuadrantDiagram { quadrantText accessible* }RadarDiagram { radarText accessible* }+TreemapDiagram { treemapText accessible* }XYChartDiagram { xyChartText accessible* }PacketDiagram { packetText accessible* }ArchitectureDiagram { architectureText accessible* }@@ -85,6 +87,7 @@ AccDescr { accDescrKeyword (":" AccText? | "{" accBlockText? "}") }TimelineDiagram,quadrantText,radarText,+ treemapText,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 3e99abbdc3..9f585828d8 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts@@ -4,35 +4,36 @@ export constfrontMatterStart = 1,FrontMatterContent = 2,frontMatterEnd = 3,- preDiagramLine = 41,+ preDiagramLine = 42,Directive = 4,LineComment = 5,- pieText = 42,+ pieText = 43,MindmapDiagram = 6,- flowchartText = 43,- sequenceText = 44,- journeyText = 45,- requirementText = 46,- ganttText = 47,+ flowchartText = 44,+ sequenceText = 45,+ journeyText = 46,+ requirementText = 47,+ ganttText = 48,TimelineDiagram = 7,- quadrantText = 48,- radarText = 49,+ quadrantText = 49,+ radarText = 50,+ treemapText = 51,SankeyDiagram = 8,- xyChartText = 50,- packetText = 51,+ xyChartText = 52,+ packetText = 53,KanbanDiagram = 9,BlockDiagram = 10,- architectureText = 52,- classText = 53,- stateText = 54,- erText = 55,- gitText = 56,- c4Text = 57,+ architectureText = 54,+ classText = 55,+ stateText = 56,+ erText = 57,+ gitText = 58,+ c4Text = 59,accTitleKeyword = 11,accDescrKeyword = 12,AccText = 13,accBlockText = 14,- diagramRest = 58,+ diagramRest = 60,MermaidDiagram = 15,FrontMatter = 16,PieDiagram = 17,@@ -45,11 +46,12 @@ export constGanttDiagram = 27,QuadrantDiagram = 28,RadarDiagram = 29,- XYChartDiagram = 30,- PacketDiagram = 31,- ArchitectureDiagram = 32,- ClassDiagram = 33,- StateDiagram = 34,- ERDiagram = 35,- GitDiagram = 36,- C4Diagram = 37+ TreemapDiagram = 30,+ XYChartDiagram = 31,+ PacketDiagram = 32,+ ArchitectureDiagram = 33,+ ClassDiagram = 34,+ StateDiagram = 35,+ ERDiagram = 36,+ GitDiagram = 37,+ C4Diagram = 38diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.tsindex 4d585d234d..d85927bd9e 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: "(QO!sQVOOO!zOQO'#ClOOQS'#DS'#DSOVQTOOO#SQXO'#CmO#bQXO'#CsO#pQXO'#CtO$OQXO'#CuO$^QXO'#CvO$lQXO'#CwO$zQXO'#CxO%YQXO'#CyO%hQXO'#CzO%vQXO'#C{O&UQXO'#C|O&dQXO'#C}O&rQXO'#DOO'QQXO'#DPO'`QXO'#DQO'nQXO'#DRQOQPOOOVQTOOOOQS,59W,59WO'|OQO,59WOOQS-E7Q-E7QO(RQPO'#CnO(WQPO'#CpOOQW'#Dk'#DkOOQW'#DT'#DTO(`QXO,59XO(nQXO,59_O(|QXO,59`O)[QXO,59aO)jQXO,59bO)xQXO,59cO*WQXO,59dO*fQXO,59eO*tQXO,59fO+SQXO,59gO+bQXO,59hO+pQXO,59iO,OQXO,59jO,^QXO,59kO,lQXO,59lO,zQXO,59mOOQS1G.r1G.rO-YQXO,59YO-kQXO,59[O-|QXO,59[OOQW-E7R-E7ROOQW1G.t1G.tOOQW1G.v1G.vO.UQPO1G.vOOQW7+$b7+$b",- stateData: ".Z~O!^OS~OSQOTQOUdOVdOWdOXdOYdOyQOzSO{TO|UO}VO!OWO!PXO!QYO!RZO!S[O!T]O!U^O!V_O!W`O!XaO!YbO!ZcO~OPPO~PVOQgORfO~OZiO[jO![kOxaX~OZiO[jO![kOxgX~OZiO[jO![kOxhX~OZiO[jO![kOxiX~OZiO[jO![kOxjX~OZiO[jO![kOxkX~OZiO[jO![kOxlX~OZiO[jO![kOxmX~OZiO[jO![kOxnX~OZiO[jO![kOxoX~OZiO[jO![kOxpX~OZiO[jO![kOxqX~OZiO[jO![kOxrX~OZiO[jO![kOxsX~OZiO[jO![kOxtX~OZiO[jO![kOxuX~OR}O~Oc!OO~Oc!POe!QO~OZiO[jO![kOxaa~OZiO[jO![kOxga~OZiO[jO![kOxha~OZiO[jO![kOxia~OZiO[jO![kOxja~OZiO[jO![kOxka~OZiO[jO![kOxla~OZiO[jO![kOxma~OZiO[jO![kOxna~OZiO[jO![kOxoa~OZiO[jO![kOxpa~OZiO[jO![kOxqa~OZiO[jO![kOxra~OZiO[jO![kOxsa~OZiO[jO![kOxta~OZiO[jO![kOxua~O]!SOZba[baxba![ba~O]!TOZda[daxda![da~O^!UOf!TO~Of!VO~O",- goto: "%l!`PPPPPPPPPPPPPPPP!a!d!iP!iPP!d!d!d!d!d!d!d!d!d!d!d!d!d!d!d#]#dPPPPPPPPPPPPPPPPPPPPP$xReOVdORe!ckSTUVWXYZ[]^_`abcmnopqrstuvwxyz{|SROeRhRQmSQnTQoUQpVQqWQrXQsYQtZQu[Qv]Qw^Qx_Qy`QzaQ{bQ|cq!Rmnopqrstuvwxyz{|!clSTUVWXYZ[]^_`abcmnopqrstuvwxyz{|",- 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 XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",- maxTerm: 61,+ 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,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!`~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 106f64dd72..8043ea56d1 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts@@ -20,6 +20,7 @@ import {TimelineDiagram,quadrantText,radarText,+ treemapText,SankeyDiagram,xyChartText,packetText,@@ -51,6 +52,8 @@ const diagramMap: Record<string, number> = {"timeline": TimelineDiagram,"quadrantChart": quadrantText,"radar-beta": radarText,+ "treemap-beta": treemapText,+ "treemap": treemapText,"sankey-beta": SankeyDiagram,"sankey": SankeyDiagram,"xychart-beta": xyChartText,@@ -81,8 +84,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, xyChartText, packetText, architectureText, classText, stateText, erText, gitText,- c4Text+ radarText, treemapText, xyChartText, packetText, architectureText, classText, stateText, erText,+ gitText, c4Text]);/**diff --git a/packages/codemirror/src/languages/mermaid/parsers/treemap/highlight.ts b/packages/codemirror/src/languages/mermaid/parsers/treemap/highlight.tsnew file mode 100644index 0000000000..0b525bff8d--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treemap/highlight.ts@@ -0,0 +1,15 @@+import { styleTags } from "@lezer/highlight";++import { treemapTags } from "../../tags/index.js";++export const treemapHighlighting = styleTags({+ "ClassName": treemapTags.className,+ "DiagramName": treemapTags.diagramName,+ "Keyword": treemapTags.keyword,+ "LineComment": treemapTags.lineComment,+ "Number": treemapTags.number,+ "String": treemapTags.string,+ "Styles": treemapTags.styles,+ "TitleText": treemapTags.titleText,+ ": , ::: ;": treemapTags.separator+});diff --git a/packages/codemirror/src/languages/mermaid/parsers/treemap/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/treemap/parser.terms.tsnew file mode 100644index 0000000000..dbd23700ca--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treemap/parser.terms.ts@@ -0,0 +1,17 @@+// 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,+ Styles = 2,+ LineComment = 3,+ TreemapDiagram = 4,+ DiagramName = 5,+ Title = 6,+ Keyword = 18,+ Section = 8,+ String = 9,+ ClassSelector = 10,+ ClassName = 12,+ Leaf = 13,+ Number = 16,+ ClassDef = 17diff --git a/packages/codemirror/src/languages/mermaid/parsers/treemap/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/treemap/parser.tsnew file mode 100644index 0000000000..873539e504--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treemap/parser.ts@@ -0,0 +1,22 @@+// 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, styles} from "./tokens.js"+import {treemapHighlighting} from "./highlight.js"+const spec_identifier = {__proto__:null,"treemap-beta":50, treemap:52, title:14, classDef:36}+export const parser = LRParser.deserialize({+ version: 14,+ states: "#xOYQSOOOOQO'#Ca'#CaQbQSOOOmQSO'#CdOOQO'#Cw'#CwOOQO'#Cp'#CpQbQSOOO!UQTO'#CbO!gQSO'#CmO!gQSO'#CfOOQO,59O,59OO!lQSO,59TOOQO-E6n-E6nOOQO,58|,58|OOQQ'#Ch'#ChO!qQUO,59XOOQO,59Q,59QO#VQSO1G.oOOQO1G.s1G.sO#hQSO1G.sOOQO7+$Z7+$ZOOQO7+$_7+$_",+ stateData: "#y~OgOSROS~OiPOjPO~OVVOXRObWO~OZXO^ZO_ZOVWXXWXbWXeWX~OP]OVUXXUXbUXeUX~Oh^O~O`aO~OQcOcbOVaaXaabaaeaa~OZXOV]iX]ib]ie]i~OceOVaiXaibaieai~O",+ goto: "![lPPPPPmpPpPtPzpPPPpPP!QPPPPPP!WRQOTSQUQYRRdaQ_WR`XQUQR[UTTQU",+ nodeNames: "⚠ TitleText Styles LineComment TreemapDiagram DiagramName Title Keyword Section String ClassSelector ::: ClassName Leaf : , Number ClassDef Keyword ;",+ maxTerm: 27,+ propSources: [treemapHighlighting],+ skippedNodes: [0,3],+ repeatNodeCount: 1,+ tokenData: "&S~R^XY}YZ}]^}pq}rs!`uv#Qwx#o|}$[!Q![$a![!]$r!]!^%V!c!}%[#R#S%[#T#o%[~!SSg~XY}YZ}]^}pq}~!cUOY!`Zr!`rs!us;'S!`;'S;=`!z<%lO!`~!zOX~~!}P;=`<%l!`~#TPuv#W~#]SR~OY#WZ;'S#W;'S;=`#i<%lO#W~#lP;=`<%l#W~#rUOY#oZw#owx!ux;'S#o;'S;=`$U<%lO#o~$XP;=`<%l#o~$aO_~~$fS`~|}$a!O!P$a!Q![$a#R#S$a~$wP^~![!]$z~$}P![!]%Q~%VOZ~~%[Oc~~%aTh~}!O%p!Q![%[!c!}%[#R#S%[#T#o%[~%sT}!O%p!Q![%[!c!}%[#R#S%[#T#o%[",+ tokenizers: [titleText, styles, 0],+ topRules: {"TreemapDiagram":[0,4]},+ specialized: [{term: 24, get: (value: keyof typeof spec_identifier) => spec_identifier[value] || -1}],+ tokenPrec: 0+})diff --git a/packages/codemirror/src/languages/mermaid/parsers/treemap/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/treemap/tokens.tsnew file mode 100644index 0000000000..57308cee62--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treemap/tokens.ts@@ -0,0 +1,6 @@+import { lineText } from "../line_text.js";+import { Styles, TitleText } from "./parser.terms.js";++export const titleText = lineText(TitleText);++export const styles = lineText(Styles, [ 59 ]);diff --git a/packages/codemirror/src/languages/mermaid/parsers/treemap/treemap.grammar b/packages/codemirror/src/languages/mermaid/parsers/treemap/treemap.grammarnew file mode 100644index 0000000000..fa12cb7ab0--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/treemap/treemap.grammar@@ -0,0 +1,39 @@+// Follows the Langium grammar of Mermaid's treemap (`@mermaid-js/parser`). Mermaid nests rows by+// their indentation; highlighting reads each row on its own, so newlines and indentation are+// skipped.+@top TreemapDiagram { DiagramName statement* }++statement { Title | Section | Leaf | ClassDef }++Title { kw<"title"> TitleText? }++Section { String ClassSelector? }++Leaf { String (":" | ",") Number ClassSelector? }++ClassSelector { ":::" ClassName }++ClassDef { kw<"classDef"> ClassName Styles? ";"? }++ClassName { identifier }++DiagramName { @specialize<identifier, "treemap-beta"> | @specialize<identifier, "treemap"> }++kw<term> { @specialize[@name=Keyword]<identifier, term> }++@skip { space | LineComment }++@external tokens titleText from "./tokens.js" { TitleText }++@external tokens styles from "./tokens.js" { Styles }++@tokens {+ space { $[ \t\r\n]+ }+ identifier { (@asciiLetter | "_") ($[a-zA-Z0-9_\-]* $[a-zA-Z0-9_])? }+ Number { @digit $[0-9_.,]* }+ String { '"' !["\n]* '"' | "'" !['\n]* "'" }+ LineComment { "%%" ![\n]* }+ ":" "," ":::" ";"+}++@external propSource treemapHighlighting from "./highlight.js"diff --git a/packages/codemirror/src/languages/mermaid/tags/index.ts b/packages/codemirror/src/languages/mermaid/tags/index.tsindex 7c543f749a..42a560b634 100644--- a/packages/codemirror/src/languages/mermaid/tags/index.ts+++ b/packages/codemirror/src/languages/mermaid/tags/index.ts@@ -229,3 +229,15 @@ export const radarTags = {string: Tag.define(t.string),titleText: Tag.define(t.string)};++export const treemapTags = {+ className: Tag.define(t.className),+ diagramName: Tag.define(mermaidTags.diagramName),+ keyword: Tag.define(t.keyword),+ lineComment: Tag.define(t.lineComment),+ number: Tag.define(t.number),+ separator: Tag.define(t.separator),+ string: Tag.define(t.string),+ styles: Tag.define(t.attributeValue),+ 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 a15af3b115..bb76d66ccb 100644--- a/packages/codemirror/src/languages/mermaid/test/mermaid.txt+++ b/packages/codemirror/src/languages/mermaid/test/mermaid.txt@@ -377,3 +377,12 @@ radar-beta==>MermaidDiagram(RadarDiagram(DiagramName,Axes(Keyword,Axis(Name))))++# Treemap++treemap+"A": 1++==>++MermaidDiagram(TreemapDiagram(DiagramName,Leaf(String,":",Number)))diff --git a/packages/codemirror/src/languages/mermaid/test/treemap.txt b/packages/codemirror/src/languages/mermaid/test/treemap.txtnew file mode 100644index 0000000000..0e6f798e78--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/test/treemap.txt@@ -0,0 +1,83 @@+# Treemap++treemap-beta++==>++TreemapDiagram(DiagramName)++# Trilium's sample++treemap-beta+"Section 1"+ "Leaf 1.1": 12+ "Section 1.2"+ "Leaf 1.2.1": 12+"Section 2"+ "Leaf 2.1": 20+ "Leaf 2.2": 25++==>++TreemapDiagram(DiagramName,+ Section(String),+ Leaf(String,":",Number),+ Section(String),+ Leaf(String,":",Number),+ Section(String),+ Leaf(String,":",Number),+ Leaf(String,":",Number))++# Classes and a comma before the value++treemap+"Root":::hot+ "A": 10:::cold+ 'B', 1,000.5+classDef hot fill:#f00,color:#fff;+classDef cold++==>++TreemapDiagram(DiagramName,+ Section(String,ClassSelector(":::",ClassName)),+ Leaf(String,":",Number,ClassSelector(":::",ClassName)),+ Leaf(String,",",Number),+ ClassDef(Keyword,ClassName,Styles,";"),+ ClassDef(Keyword,ClassName))++# Title with a comment after it++treemap-beta+title My map %% a comment+"A": 1++==>++TreemapDiagram(DiagramName,Title(Keyword,TitleText),LineComment,Leaf(String,":",Number))++# Leaf on the diagram line++treemap-beta "A": 1++==>++TreemapDiagram(DiagramName,Leaf(String,":",Number))++# Negative value (invalid)++treemap-beta+"A": -1++==>++TreemapDiagram(DiagramName,Leaf(String,":",⚠,Number))++# Value without a separator (invalid)++treemap-beta+"A" 1++==>++TreemapDiagram(DiagramName,Section(String,⚠(Number)))