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 Venn diagrams
Elian Doran3517905a773a
diff --git a/packages/codemirror/src/languages/mermaid/index.ts b/packages/codemirror/src/languages/mermaid/index.tsindex 1cbfa3cd55..25de2377ae 100644--- a/packages/codemirror/src/languages/mermaid/index.ts+++ b/packages/codemirror/src/languages/mermaid/index.ts@@ -37,6 +37,7 @@ 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 vennParser } from "./parsers/venn/parser.js";import { parser as wardleyParser } from "./parsers/wardley/parser.js";import { parser as xychartParser } from "./parsers/xychart/parser.js";@@ -77,6 +78,7 @@ export const DIAGRAM_PARSERS: Record<string, LRParser> = {TimelineDiagram: timelineParser,TreemapDiagram: treemapParser,TreeViewDiagram: treeViewParser,+ VennDiagram: vennParser,WardleyDiagram: wardleyParser,XYChartDiagram: xychartParser};diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammarindex 3e731829ba..34098b8bd7 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar@@ -25,6 +25,7 @@RailroadAbnfDiagram |RailroadPegDiagram |IshikawaDiagram |+ VennDiagram |SankeyDiagram |XYChartDiagram |PacketDiagram |@@ -113,6 +114,7 @@ AccDescr { accDescrKeyword (":" AccText? | "{" accBlockText? "}") }railroadAbnfText,railroadPegText,IshikawaDiagram,+ VennDiagram,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 74c22e3d16..fc1beeaac8 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts@@ -4,70 +4,71 @@ export constfrontMatterStart = 1,FrontMatterContent = 2,frontMatterEnd = 3,- preDiagramLine = 51,+ preDiagramLine = 52,Directive = 4,LineComment = 5,- pieText = 52,+ pieText = 53,MindmapDiagram = 6,- flowchartText = 53,- sequenceText = 54,- journeyText = 55,- requirementText = 56,- ganttText = 57,+ flowchartText = 54,+ sequenceText = 55,+ journeyText = 56,+ requirementText = 57,+ ganttText = 58,TimelineDiagram = 7,- quadrantText = 58,- radarText = 59,- treemapText = 60,- treeViewText = 61,- wardleyText = 62,- cynefinText = 63,+ quadrantText = 59,+ radarText = 60,+ treemapText = 61,+ treeViewText = 62,+ wardleyText = 63,+ cynefinText = 64,EventModelingDiagram = 8,- railroadText = 64,- railroadEbnfText = 65,- railroadAbnfText = 66,- railroadPegText = 67,+ railroadText = 65,+ railroadEbnfText = 66,+ railroadAbnfText = 67,+ railroadPegText = 68,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+ VennDiagram = 10,+ SankeyDiagram = 11,+ xyChartText = 69,+ packetText = 70,+ KanbanDiagram = 12,+ BlockDiagram = 13,+ architectureText = 71,+ classText = 72,+ stateText = 73,+ erText = 74,+ gitText = 75,+ c4Text = 76,+ accTitleKeyword = 14,+ accDescrKeyword = 15,+ AccText = 16,+ accBlockText = 17,+ diagramRest = 77,+ MermaidDiagram = 18,+ FrontMatter = 19,+ PieDiagram = 20,+ AccTitle = 21,+ AccDescr = 23,+ FlowchartDiagram = 26,+ SequenceDiagram = 27,+ JourneyDiagram = 28,+ RequirementDiagram = 29,+ GanttDiagram = 30,+ QuadrantDiagram = 31,+ RadarDiagram = 32,+ TreemapDiagram = 33,+ TreeViewDiagram = 34,+ WardleyDiagram = 35,+ CynefinDiagram = 36,+ RailroadDiagram = 37,+ RailroadEbnfDiagram = 38,+ RailroadAbnfDiagram = 39,+ RailroadPegDiagram = 40,+ XYChartDiagram = 41,+ PacketDiagram = 42,+ ArchitectureDiagram = 43,+ ClassDiagram = 44,+ StateDiagram = 45,+ ERDiagram = 46,+ GitDiagram = 47,+ C4Diagram = 48diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.tsindex c4e59f9cc2..2c68b4d683 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#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,+ states: "*UO#fQVOOO#mOQO'#CoOOQS'#D_'#D_OVQTOOO#uQXO'#CpO$TQXO'#CvO$cQXO'#CwO$qQXO'#CxO%PQXO'#CyO%_QXO'#CzO%mQXO'#C{O%{QXO'#C|O&ZQXO'#C}O&iQXO'#DOO&wQXO'#DPO'VQXO'#DQO'eQXO'#DRO'sQXO'#DSO(RQXO'#DTO(aQXO'#DUO(oQXO'#DVO(}QXO'#DWO)]QXO'#DXO)kQXO'#DYO)yQXO'#DZO*XQXO'#D[O*gQXO'#D]O*uQXO'#D^QOQPOOOVQTOOOOQS,59Z,59ZO+TOQO,59ZOOQS-E7]-E7]O+YQPO'#CqO+_QPO'#CsOOQW'#EO'#EOOOQW'#D`'#D`O+gQXO,59[O+uQXO,59bO,TQXO,59cO,cQXO,59dO,qQXO,59eO-PQXO,59fO-_QXO,59gO-mQXO,59hO-{QXO,59iO.ZQXO,59jO.iQXO,59kO.wQXO,59lO/VQXO,59mO/eQXO,59nO/sQXO,59oO0RQXO,59pO0aQXO,59qO0oQXO,59rO0}QXO,59sO1]QXO,59tO1kQXO,59uO1yQXO,59vO2XQXO,59wO2gQXO,59xOOQS1G.u1G.uO2uQXO,59]O3WQXO,59_O3iQXO,59_OOQW-E7^-E7^OOQW1G.w1G.wOOQW1G.y1G.yO3qQPO1G.yOOQW7+$e7+$e",+ stateData: "3v~O!qOS~OSQOTQOUlOVlOWlOXlOYlOZlO[lO]lO!UQO!VSO!WTO!XUO!YVO!ZWO![XO!]YO!^ZO!_[O!`]O!a^O!b_O!c`O!daO!ebO!fcO!gdO!heO!ifO!jgO!khO!liO!mjO!nkO~OPPO~PVOQoORnO~O^qO_rO!osO!TdX~O^qO_rO!osO!TjX~O^qO_rO!osO!TkX~O^qO_rO!osO!TlX~O^qO_rO!osO!TmX~O^qO_rO!osO!TnX~O^qO_rO!osO!ToX~O^qO_rO!osO!TpX~O^qO_rO!osO!TqX~O^qO_rO!osO!TrX~O^qO_rO!osO!TsX~O^qO_rO!osO!TtX~O^qO_rO!osO!TuX~O^qO_rO!osO!TvX~O^qO_rO!osO!TwX~O^qO_rO!osO!TxX~O^qO_rO!osO!TyX~O^qO_rO!osO!TzX~O^qO_rO!osO!T{X~O^qO_rO!osO!T|X~O^qO_rO!osO!T}X~O^qO_rO!osO!T!OX~O^qO_rO!osO!T!PX~O^qO_rO!osO!T!QX~OR!_O~Of!`O~Of!aOh!bO~O^qO_rO!osO!Tda~O^qO_rO!osO!Tja~O^qO_rO!osO!Tka~O^qO_rO!osO!Tla~O^qO_rO!osO!Tma~O^qO_rO!osO!Tna~O^qO_rO!osO!Toa~O^qO_rO!osO!Tpa~O^qO_rO!osO!Tqa~O^qO_rO!osO!Tra~O^qO_rO!osO!Tsa~O^qO_rO!osO!Tta~O^qO_rO!osO!Tua~O^qO_rO!osO!Tva~O^qO_rO!osO!Twa~O^qO_rO!osO!Txa~O^qO_rO!osO!Tya~O^qO_rO!osO!Tza~O^qO_rO!osO!T{a~O^qO_rO!osO!T|a~O^qO_rO!osO!T}a~O^qO_rO!osO!T!Oa~O^qO_rO!osO!T!Pa~O^qO_rO!osO!T!Qa~O`!dO^ea_ea!Tea!oea~O`!eO^ga_ga!Tga!oga~Oa!fOi!eO~Oi!gO~O",+ goto: "'c!sPPPPPPPPPPPPPPPPPPP!t!w!|P!|PP!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w!w$Q$XPPPPPPPPPPPPPPPPPPPPPPPPPPPPP&_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 VennDiagram 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: 80,propSources: [mermaidHighlighting],skippedNodes: [0],repeatNodeCount: 2,- tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!p~XYe]^epqe~xOe~~}Og~~!SOh~",+ tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!q~XYe]^epqe~xOf~~}Oh~~!SOi~",tokenizers: [0, frontMatter, diagramText, accessibility],- topRules: {"MermaidDiagram":[0,17]},+ topRules: {"MermaidDiagram":[0,18]},tokenPrec: 0})diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.tsindex 9e55cc4016..7030cc5a5d 100644--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts@@ -30,6 +30,7 @@ import {railroadAbnfText,railroadPegText,IshikawaDiagram,+ VennDiagram,SankeyDiagram,xyChartText,packetText,@@ -73,6 +74,7 @@ const diagramMap: Record<string, number> = {"railroad-peg-beta": railroadPegText,"ishikawa-beta": IshikawaDiagram,"ishikawa": IshikawaDiagram,+ "venn-beta": VennDiagram,"sankey-beta": SankeyDiagram,"sankey": SankeyDiagram,"xychart-beta": xyChartText,diff --git a/packages/codemirror/src/languages/mermaid/parsers/venn/highlight.ts b/packages/codemirror/src/languages/mermaid/parsers/venn/highlight.tsnew file mode 100644index 0000000000..458a6901ae--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/venn/highlight.ts@@ -0,0 +1,17 @@+import { styleTags } from "@lezer/highlight";++import { vennTags } from "../../tags/index.js";++export const vennHighlighting = styleTags({+ "Color": vennTags.color,+ "DiagramName": vennTags.diagramName,+ "Keyword": vennTags.keyword,+ "Label": vennTags.label,+ "LineComment": vennTags.lineComment,+ "Name": vennTags.name,+ "Number": vennTags.number,+ "Property": vennTags.property,+ "String": vennTags.string,+ "TitleText": vennTags.titleText,+ ": ,": vennTags.separator+});diff --git a/packages/codemirror/src/languages/mermaid/parsers/venn/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/venn/parser.terms.tsnew file mode 100644index 0000000000..b7566201a9--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/venn/parser.terms.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.+export const+ TitleText = 1,+ LineComment = 2,+ VennDiagram = 3,+ DiagramName = 4,+ Title = 5,+ Keyword = 21,+ Set = 7,+ Name = 9,+ String = 10,+ Label = 11,+ Size = 12,+ Number = 14,+ Union = 15,+ Text = 18,+ Style = 20,+ StyleField = 22,+ Property = 23,+ Color = 24diff --git a/packages/codemirror/src/languages/mermaid/parsers/venn/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/venn/parser.tsnew file mode 100644index 0000000000..43d18f5fa2--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/venn/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} from "./tokens.js"+import {vennHighlighting} from "./highlight.js"+const spec_identifier = {__proto__:null,"venn-beta":66, title:12, set:16, union:32, text:38, style:42}+export const parser = LRParser.deserialize({+ version: 14,+ states: "'OOYQQOOOOQO'#C`'#C`Q_QQOOOOQO'#DO'#DOOOQO'#Cu'#CuQ_QQOOOpQRO'#CaO!XQQO'#CcO!XQQO'#CkO!XQQO'#CnO!XQQO'#CpOOQO-E6s-E6sOOQO,58{,58{OOQO'#Ce'#CeOOQO'#DP'#DPO!aQQO,58}O!{QQO'#DQO#pQQO,59VO$[QQO,59YO$yQQO,59[O%OQQO'#ChOOQO1G.i1G.iO%TQQO1G.iO!XQQO'#CvO%lQQO,59lOOQO1G.q1G.qO&aQQO1G.qOOQO1G.t1G.tO&xQQO1G.tOOQO'#Cs'#CsO'aQQO'#CrO'fQQO1G.vOOQO,59S,59SOOQO7+$T7+$TOOQO,59b,59bOOQO-E6t-E6tOOQO7+$]7+$]OOQO7+$`7+$`O'}QQO,59^O$yQQO'#CxO(]QQO7+$bOOQO'#Cw'#CwO(tQQO1G.xOOQO,59d,59dOOQO-E6v-E6vOOQO-E6u-E6u",+ stateData: ")l~OoOSQOS~OqPO~OUUOWVO`WOcXOeYO~OP[OUTXWTX`TXcTXeTXmTX~OY^Op]O~OZfO]dOUVaWVa`VacVaeVamVa~OagOUtXWtXZtX]tX`tXctXetXmtXYtXptX~OZjO]dOU_aW_a`_ac_ae_am_a~OY^OZkOp]OUbaWba`bacbaebamba~OpmO~O^pO~O]dOUViWVi`VicVieVimVi~OagOUtaWtaZta]ta`tactaetamtaYtapta~O]dOU_iW_i`_ic_ie_im_i~OZuOUbiWbi`bicbiebimbi~O]vO~OawOUdiWdi`dicdiedimdi~OYyO^yOhyOp]O~OawOUdqWdq`dqcdqedqmdq~OYyO^yOhyOp]OUfiWfi`fiaficfiefimfi~Ohp~",+ goto: "#vuPPPPvyPyP}PP!ZPPyPPyPyP!g!mP!q!w!}#TPPPPP#Z#_#mRQOTRQT[^VWXYbgTyvzQe_QiaQqfRtjQocR{wTncwQTQRZTQh`RshQzvR}zQxoR|xTSQTQ_VU`WXYQlbRrgQaWQbXRcY",+ nodeNames: "⚠ TitleText LineComment VennDiagram DiagramName Title Keyword Set Keyword Name String Label Size : Number Union Keyword , Text Keyword Style Keyword StyleField Property Color",+ maxTerm: 36,+ propSources: [vennHighlighting],+ skippedNodes: [0,2],+ repeatNodeCount: 4,+ tokenData: "*n~RcXY!^YZ!^]^!^pq!^rs!ost#auv#{{|$j|}%^}!O$j!O!P$s!Q![%R![!]%c!c!}%h!}#O%|#R#S%h#T#f%h#f#g's#g#o%h~!cSo~XY!^YZ!^]^!^pq!^~!rUOY!oZr!ors#Us;'S!o;'S;=`#Z<%lO!o~#ZOY~~#^P;=`<%l!o~#dR!Q![#m!c!i#m#T#Z#m~#rRh~!Q![#m!c!i#m#T#Z#m~$OPuv$R~$WSQ~OY$RZ;'S$R;'S;=`$d<%lO$R~$gP;=`<%l$R~$mQ!O!P$s!Q![%R~$vP!Q![$y~%OP^~!Q![$y~%WQ^~!O!P$s!Q![%R~%cOa~~%hO]~~%mTp~}!O%h!Q![%h!c!}%h#R#S%h#T#o%h~&PUOr&crs'Ts#P&c#Q;'S&c;'S;=`&}<%lO&c~&fUOr&cs#P&c#P#Q&x#Q;'S&c;'S;=`&}<%lO&c~&}OZ~~'QP;=`<%l&c~'WTOr'Trs'gs;'S'T;'S;=`'m<%lO'T~'jP#P#Q&x~'pP;=`<%l'T~'xVp~}!O%h!Q![%h!c!}%h#R#S%h#T#Z%h#Z#[(_#[#o%h~(dVp~}!O%h!Q![%h!c!}%h#R#S%h#T#U%h#U#V(y#V#o%h~)OVp~xy)e}!O%h!Q![%h!c!}%h#R#S%h#T#U*V#U#o%h~)hUOY)eZy)eyz)zz;'S)e;'S;=`*P<%lO)e~*POh~~*SP;=`<%l)e~*[Up~xy)e}!O%h!Q![%h!c!}%h#R#S%h#T#o%h",+ tokenizers: [titleText, 0],+ topRules: {"VennDiagram":[0,3]},+ specialized: [{term: 32, get: (value: keyof typeof spec_identifier) => spec_identifier[value] || -1}],+ tokenPrec: 393+})diff --git a/packages/codemirror/src/languages/mermaid/parsers/venn/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/venn/tokens.tsnew file mode 100644index 0000000000..9c9e589c24--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/venn/tokens.ts@@ -0,0 +1,4 @@+import { lineText } from "../line_text.js";+import { TitleText } from "./parser.terms.js";++export const titleText = lineText(TitleText, [ 35, 59 ]);diff --git a/packages/codemirror/src/languages/mermaid/parsers/venn/venn.grammar b/packages/codemirror/src/languages/mermaid/parsers/venn/venn.grammarnew file mode 100644index 0000000000..a7527cb908--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/parsers/venn/venn.grammar@@ -0,0 +1,49 @@+// Follows Mermaid's Venn diagram (a Jison grammar). An indented `text` names a text node of the+// last set, an unindented one lists its sets first; one rule reads both.+@top VennDiagram { DiagramName statement* }++statement { Title | Set | Union | Text | Style }++Title { kw<"title"> TitleText? }++Set { kw<"set"> name Label? Size? }++Union { kw<"union"> names Label? Size? }++Text { kw<"text"> names name? Label? }++Style { kw<"style"> names StyleField ("," StyleField)* }++StyleField { Property ":" (Name | String | Number | Color)+ }++Size { ":" Number }++names { name ("," name)* }++name { Name | String }++Name { identifier }++Property { identifier }++DiagramName { @specialize<identifier, "venn-beta"> }++kw<term> { @specialize[@name=Keyword]<identifier, term> }++@skip { space | LineComment }++@external tokens titleText from "./tokens.js" { TitleText }++@tokens {+ space { $[ \t\r\n]+ }+ identifier { $[A-Za-z_] $[A-Za-z0-9\-_]* }+ Number { $[+\-]? (@digit+ ("." @digit+)? | "." @digit+) }+ Color { "#" $[0-9a-fA-F]+ | "rgb" "a"? "(" ![)\n]* ")" }+ String { '"' !["\n]* '"' }+ Label { '["' !["]* '"]' | "[" ![\]"]+ "]" }+ LineComment { "%%" ![\n]* }+ ":" ","+ @precedence { Color, identifier }+}++@external propSource vennHighlighting from "./highlight.js"diff --git a/packages/codemirror/src/languages/mermaid/tags/index.ts b/packages/codemirror/src/languages/mermaid/tags/index.tsindex 6cf918d48a..12c97f3037 100644--- a/packages/codemirror/src/languages/mermaid/tags/index.ts+++ b/packages/codemirror/src/languages/mermaid/tags/index.ts@@ -313,3 +313,17 @@ export const ishikawaTags = {effect: Tag.define(t.heading),lineComment: Tag.define(t.lineComment)};++export const vennTags = {+ color: Tag.define(t.color),+ diagramName: Tag.define(mermaidTags.diagramName),+ keyword: Tag.define(t.keyword),+ label: Tag.define(t.string),+ lineComment: Tag.define(t.lineComment),+ name: Tag.define(t.variableName),+ number: Tag.define(t.number),+ property: Tag.define(t.propertyName),+ separator: Tag.define(t.separator),+ string: 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 298329ec64..2c04b364eb 100644--- a/packages/codemirror/src/languages/mermaid/test/mermaid.txt+++ b/packages/codemirror/src/languages/mermaid/test/mermaid.txt@@ -467,3 +467,12 @@ ishikawa-beta==>MermaidDiagram(IshikawaDiagram(DiagramName,Effect))++# Venn++venn-beta+ set A++==>++MermaidDiagram(VennDiagram(DiagramName,Set(Keyword,Name)))diff --git a/packages/codemirror/src/languages/mermaid/test/venn.txt b/packages/codemirror/src/languages/mermaid/test/venn.txtnew file mode 100644index 0000000000..91328150b9--- /dev/null+++ b/packages/codemirror/src/languages/mermaid/test/venn.txt@@ -0,0 +1,55 @@+# Venn++venn-beta++==>++VennDiagram(DiagramName)++# Trilium's sample++venn-beta+ title Web Dev+ set Frontend+ text React+ text shadcn-ui+ set Backend+ text Hono+ union Frontend,Backend["APIs"]++==>++VennDiagram(DiagramName,Title(Keyword,TitleText),+ Set(Keyword,Name),Text(Keyword,Name),Text(Keyword,Name),+ Set(Keyword,Name),Text(Keyword,Name),+ Union(Keyword,Name,",",Name,Label))++# Labels, sizes and quoted names++venn-beta+set A["Alpha"]: 20+set "Quoted set"[Beta]+union A,"Quoted set": .5+ text "note"[Note]+text A,B shared["Shared"] %% a comment++==>++VennDiagram(DiagramName,+ Set(Keyword,Name,Label,Size(":",Number)),+ Set(Keyword,String,Label),+ Union(Keyword,Name,",",String,Size(":",Number)),+ Text(Keyword,String,Label),+ Text(Keyword,Name,",",Name,Name,Label),LineComment)++# Styles++venn-beta+style A fill:#f00, color:rgb(1, 2, 3), stroke-width:2px+style A,B opacity:-0.5, label:"x y", fill:rgba(1, 2, 3, 0.5)++==>++VennDiagram(DiagramName,+ Style(Keyword,Name,StyleField(Property,":",Color),",",StyleField(Property,":",Color),",",StyleField(Property,":",Number,Name)),+ Style(Keyword,Name,",",Name,StyleField(Property,":",Number),",",StyleField(Property,":",String),",",StyleField(Property,":",Color)))