Skip to content

Build your personal knowledge base with Trilium Notes

feat(codemirror): highlight Mermaid radar diagrams

Elian Doran47126768f05f
diff --git a/packages/codemirror/src/languages/mermaid/index.ts b/packages/codemirror/src/languages/mermaid/index.ts
index 9b5782e1a4..cc198acf2f 100644
--- a/packages/codemirror/src/languages/mermaid/index.ts
+++ b/packages/codemirror/src/languages/mermaid/index.ts
@@ -22,6 +22,7 @@ import { parser as mindmapParser } from "./parsers/mindmap/parser.js";
import { parser as packetParser } from "./parsers/packet/parser.js";
import { parser as pieParser } from "./parsers/pie/parser.js";
import { parser as quadrantParser } from "./parsers/quadrant/parser.js";
+import { parser as radarParser } from "./parsers/radar/parser.js";
import { parser as requirementParser } from "./parsers/requirement/parser.js";
import { parser as sankeyParser } from "./parsers/sankey/parser.js";
import { parser as sequenceParser } from "./parsers/sequence/parser.js";
@@ -51,6 +52,7 @@ export const DIAGRAM_PARSERS: Record<string, LRParser> = {
PacketDiagram: packetParser,
PieDiagram: pieParser,
QuadrantDiagram: quadrantParser,
+ RadarDiagram: radarParser,
RequirementDiagram: requirementParser,
SankeyDiagram: sankeyParser,
SequenceDiagram: sequenceParser,
diff --git a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
index e40cc79619..250f12c9ab 100644
--- a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
+++ b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
@@ -114,7 +114,8 @@ describe("accessibility lines", () => {
"pie\n \"A\": 1", "journey\n title X", "gitGraph\n commit",
"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]"
+ "packet-beta\n 0-15: \"A\"", "architecture-beta\n service a(server)[A]",
+ "radar-beta\n axis a"
];
const lines = [
" accTitle: My title", " accDescr: My description", " accDescr {\n Line one\n }"
@@ -159,6 +160,18 @@ describe("kanban grammar", () => {
});
});
+describe("radar grammar", () => {
+ it("ends a title at a comment and leaves out the spaces around it", () => {
+ const doc = "radar-beta\n title Grades \t%% note\n title\r\n axis a";
+ const tree = parserOf("radar").parse(doc);
+ const titles = tree.topNode.getChildren("Title").map((title) => {
+ const text = title.getChild("TitleText");
+ return text && doc.slice(text.from, text.to);
+ });
+ expect(titles).toEqual([ "Grades", 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/line_text.ts b/packages/codemirror/src/languages/mermaid/parsers/line_text.ts
new file mode 100644
index 0000000000..10b2a12535
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/line_text.ts
@@ -0,0 +1,26 @@
+import { ExternalTokenizer } from "@lezer/lr";
+
+const whitespace = [ 9, 13, 32 ];
+
+/**
+ * A tokenizer for the text after a keyword on the same line, such as a `title` or the styles of a
+ * `classDef`. The text ends at a `%%` comment, the line's end or one of `stops`, without the
+ * spaces around it. The tokenizer leaves leading whitespace to the grammar's skip, then looks back
+ * for a newline after the keyword.
+ */
+export function lineText(term: number, stops: readonly number[] = []) {
+ return new ExternalTokenizer((input) => {
+ if (whitespace.includes(input.next)) return;
+ for (let offset = -1; [ ...whitespace, 10 ].includes(input.peek(offset)); offset--) {
+ if (input.peek(offset) === 10) return;
+ }
+
+ let length = 0;
+ let end = 0;
+ for (let next = input.peek(0); next !== 10 && next !== -1; next = input.peek(++length)) {
+ if (stops.includes(next) || (next === 37 && input.peek(length + 1) === 37)) break;
+ if (!whitespace.includes(next)) end = length + 1;
+ }
+ if (end > 0) input.acceptToken(term, end);
+ });
+}
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
index b4491529ac..40c13db4dd 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
@@ -14,6 +14,7 @@
GanttDiagram |
TimelineDiagram |
QuadrantDiagram |
+ RadarDiagram |
SankeyDiagram |
XYChartDiagram |
PacketDiagram |
@@ -35,6 +36,7 @@ JourneyDiagram { journeyText accessible* }
RequirementDiagram { requirementText accessible* }
GanttDiagram { ganttText accessible* }
QuadrantDiagram { quadrantText accessible* }
+RadarDiagram { radarText accessible* }
XYChartDiagram { xyChartText accessible* }
PacketDiagram { packetText accessible* }
ArchitectureDiagram { architectureText accessible* }
@@ -82,6 +84,7 @@ AccDescr { accDescrKeyword (":" AccText? | "{" accBlockText? "}") }
ganttText,
TimelineDiagram,
quadrantText,
+ radarText,
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 5f0f21bbb2..3e99abbdc3 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
@@ -4,34 +4,35 @@ export const
frontMatterStart = 1,
FrontMatterContent = 2,
frontMatterEnd = 3,
- preDiagramLine = 40,
+ preDiagramLine = 41,
Directive = 4,
LineComment = 5,
- pieText = 41,
+ pieText = 42,
MindmapDiagram = 6,
- flowchartText = 42,
- sequenceText = 43,
- journeyText = 44,
- requirementText = 45,
- ganttText = 46,
+ flowchartText = 43,
+ sequenceText = 44,
+ journeyText = 45,
+ requirementText = 46,
+ ganttText = 47,
TimelineDiagram = 7,
- quadrantText = 47,
+ quadrantText = 48,
+ radarText = 49,
SankeyDiagram = 8,
- xyChartText = 48,
- packetText = 49,
+ xyChartText = 50,
+ packetText = 51,
KanbanDiagram = 9,
BlockDiagram = 10,
- architectureText = 50,
- classText = 51,
- stateText = 52,
- erText = 53,
- gitText = 54,
- c4Text = 55,
+ architectureText = 52,
+ classText = 53,
+ stateText = 54,
+ erText = 55,
+ gitText = 56,
+ c4Text = 57,
accTitleKeyword = 11,
accDescrKeyword = 12,
AccText = 13,
accBlockText = 14,
- diagramRest = 56,
+ diagramRest = 58,
MermaidDiagram = 15,
FrontMatter = 16,
PieDiagram = 17,
@@ -43,11 +44,12 @@ export const
RequirementDiagram = 26,
GanttDiagram = 27,
QuadrantDiagram = 28,
- XYChartDiagram = 29,
- PacketDiagram = 30,
- ArchitectureDiagram = 31,
- ClassDiagram = 32,
- StateDiagram = 33,
- ERDiagram = 34,
- GitDiagram = 35,
- C4Diagram = 36
+ RadarDiagram = 29,
+ XYChartDiagram = 30,
+ PacketDiagram = 31,
+ ArchitectureDiagram = 32,
+ ClassDiagram = 33,
+ StateDiagram = 34,
+ ERDiagram = 35,
+ GitDiagram = 36,
+ C4Diagram = 37
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts
index 868a0282d2..4d585d234d 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: "'tO!pQVOOO!wOQO'#ClOOQS'#DR'#DROVQTOOO#PQXO'#CmO#_QXO'#CsO#mQXO'#CtO#{QXO'#CuO$ZQXO'#CvO$iQXO'#CwO$wQXO'#CxO%VQXO'#CyO%eQXO'#CzO%sQXO'#C{O&RQXO'#C|O&aQXO'#C}O&oQXO'#DOO&}QXO'#DPO']QXO'#DQQOQPOOOVQTOOOOQS,59W,59WO'kOQO,59WOOQS-E7P-E7PO'pQPO'#CnO'uQPO'#CpOOQW'#Di'#DiOOQW'#DS'#DSO'}QXO,59XO(]QXO,59_O(kQXO,59`O(yQXO,59aO)XQXO,59bO)gQXO,59cO)uQXO,59dO*TQXO,59eO*cQXO,59fO*qQXO,59gO+PQXO,59hO+_QXO,59iO+mQXO,59jO+{QXO,59kO,ZQXO,59lOOQS1G.r1G.rO,iQXO,59YO,zQXO,59[O-]QXO,59[OOQW-E7Q-E7QOOQW1G.t1G.tOOQW1G.v1G.vO-eQPO1G.vOOQW7+$b7+$b",
- stateData: "-j~O![OS~OSQOTQOUcOVcOWcOXcOYcOxQOySOzTO{UO|VO}WO!OXO!PYO!QZO!R[O!S]O!T^O!U_O!V`O!WaO!XbO~OPPO~PVOQfOReO~OZhO[iO!YjOwaX~OZhO[iO!YjOwgX~OZhO[iO!YjOwhX~OZhO[iO!YjOwiX~OZhO[iO!YjOwjX~OZhO[iO!YjOwkX~OZhO[iO!YjOwlX~OZhO[iO!YjOwmX~OZhO[iO!YjOwnX~OZhO[iO!YjOwoX~OZhO[iO!YjOwpX~OZhO[iO!YjOwqX~OZhO[iO!YjOwrX~OZhO[iO!YjOwsX~OZhO[iO!YjOwtX~OR{O~Oc|O~Oc}Oe!OO~OZhO[iO!YjOwaa~OZhO[iO!YjOwga~OZhO[iO!YjOwha~OZhO[iO!YjOwia~OZhO[iO!YjOwja~OZhO[iO!YjOwka~OZhO[iO!YjOwla~OZhO[iO!YjOwma~OZhO[iO!YjOwna~OZhO[iO!YjOwoa~OZhO[iO!YjOwpa~OZhO[iO!YjOwqa~OZhO[iO!YjOwra~OZhO[iO!YjOwsa~OZhO[iO!YjOwta~O]!QOZba[bawba!Yba~O]!ROZda[dawda!Yda~O^!SOf!RO~Of!TO~O",
- goto: "%b!^PPPPPPPPPPPPPPPP!_!b!gP!gPP!b!b!b!b!b!b!b!b!b!b!b!b!b!b#X#`PPPPPPPPPPPPPPPPPPPP$pRdOVcORd!_jSTUVWXYZ[]^_`ablmnopqrstuvwxyzSROdRgRQlSQmTQnUQoVQpWQqXQrYQsZQt[Qu]Qv^Qw_Qx`QyaQzbo!Plmnopqrstuvwxyz!_kSTUVWXYZ[]^_`ablmnopqrstuvwxyz",
- 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 XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",
- maxTerm: 59,
+ 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,
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: 0
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
index 600bfe0d00..106f64dd72 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
@@ -19,6 +19,7 @@ import {
ganttText,
TimelineDiagram,
quadrantText,
+ radarText,
SankeyDiagram,
xyChartText,
packetText,
@@ -49,6 +50,7 @@ const diagramMap: Record<string, number> = {
"gantt": ganttText,
"timeline": TimelineDiagram,
"quadrantChart": quadrantText,
+ "radar-beta": radarText,
"sankey-beta": SankeyDiagram,
"sankey": SankeyDiagram,
"xychart-beta": xyChartText,
@@ -79,7 +81,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,
- xyChartText, packetText, architectureText, classText, stateText, erText, gitText, c4Text
+ radarText, xyChartText, packetText, architectureText, classText, stateText, erText, gitText,
+ c4Text
]);
/**
diff --git a/packages/codemirror/src/languages/mermaid/parsers/radar/highlight.ts b/packages/codemirror/src/languages/mermaid/parsers/radar/highlight.ts
new file mode 100644
index 0000000000..c52b5a0a8e
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/radar/highlight.ts
@@ -0,0 +1,19 @@
+import { styleTags, tags as t } from "@lezer/highlight";
+
+import { radarTags } from "../../tags/index.js";
+
+export const radarHighlighting = styleTags({
+ "AxisRef": radarTags.axisRef,
+ "Boolean": radarTags.boolean,
+ "DiagramName": radarTags.diagramName,
+ "Graticule": radarTags.graticule,
+ "Keyword": radarTags.keyword,
+ "LineComment": radarTags.lineComment,
+ "Name": t.definition(radarTags.name),
+ "Number": radarTags.number,
+ "String": radarTags.string,
+ "TitleText": radarTags.titleText,
+ "[ ]": radarTags.squareBracket,
+ "{ }": radarTags.brace,
+ ", :": radarTags.separator
+});
diff --git a/packages/codemirror/src/languages/mermaid/parsers/radar/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/radar/parser.terms.ts
new file mode 100644
index 0000000000..16771b175d
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/radar/parser.terms.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.
+export const
+ TitleText = 1,
+ LineComment = 2,
+ RadarDiagram = 3,
+ DiagramName = 4,
+ Title = 6,
+ Keyword = 31,
+ Axes = 8,
+ Axis = 10,
+ Name = 11,
+ Label = 12,
+ String = 14,
+ Curves = 17,
+ Curve = 19,
+ Number = 21,
+ Entry = 22,
+ AxisRef = 23,
+ Option = 25,
+ Boolean = 27,
+ Graticule = 32
diff --git a/packages/codemirror/src/languages/mermaid/parsers/radar/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/radar/parser.ts
new file mode 100644
index 0000000000..a5750b1194
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/radar/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 {radarHighlighting} from "./highlight.js"
+const spec_identifier = {__proto__:null,"radar-beta":86, title:14, axis:18, curve:36, showLegend:52, true:94, false:96, ticks:56, max:58, min:60, graticule:62, circle:98, polygon:100}
+export const parser = LRParser.deserialize({
+ version: 14,
+ states: ")SOYQQOOOOQO'#C`'#C`QyQQOOO!QQQO'#D[OOQO'#DY'#DYOOQO'#C}'#C}Q_QQOOQ_QQOOO!rQRO'#CbO#dQQO'#CdO#dQQO'#CmO#iQQO'#CuO#qQQO'#CuO#vQQO'#CuOhQQO'#DSO$OQQO,59vOOQO-E6{-E6{OOQO,58|,58|OOQO'#Cg'#CgO$pQQO'#CfO%eQQO,59OO&VQQO'#CoO&_QQO,59XOOQO'#Cw'#CwOOQO,59a,59aOOQO'#C|'#C|OOQO,59n,59nOOQO-E7Q-E7QO'PQQO'#ChOOQO,59Q,59QO#dQQO'#DOO'UQQO1G.jO'vQQO,59ZO(OQQO,59ZO#dQQO'#DRO(TQQO1G.sO(uQQO,59SOOQO,59j,59jOOQO-E6|-E6|OOQO'#Cs'#CsO(zQQO'#CrO)SQQO'#DZO)[QQO'#DZO)dQQO1G.uO'vQQO1G.uOOQO,59m,59mOOQO-E7P-E7POOQO1G.n1G.nOOQO,59^,59^O)iQQO,59^O)nQQO'#DPO)sQQO,59uO'yQQO'#DQO){QQO,59uOOQO7+$a7+$aO*TQQO7+$aOOQO1G.x1G.xOOQO,59k,59kOOQO-E6}-E6}OOQO,59l,59lOOQO-E7O-E7OOOQO<<G{<<G{",
+ stateData: "*[~OyOSQOS~O{PO~OVWOXXObYOjZOl[Om[On[Oo]O~OTVO~P_O`^OV!OXX!OXb!OXj!OXl!OXm!OXn!OXo!OXw!OX~OPaOVUXXUXbUXjUXlUXmUXnUXoUXwUX~OzbO~O!PgO!QgO~OehO~O!RiO!SiO~O`^OV!OaX!Oab!Oaj!Oal!Oam!Oan!Oao!Oaw!Oa~O]lOVYXXYX`YXbYXjYXlYXmYXnYXoYXwYX~O`nOVWaXWabWajWalWamWanWaoWawWa~O]lOdpO~O`rOVaaXaabaajaalaamaanaaoaawaa~O^tO~O`nOVWiXWibWijWilWimWinWioWiwWi~OeyOzwO~Od|O~O`rOVaiXaibaijailaimainaioaiwai~O_!PO~OT!ROe!QO~O`!SOh}X~O`!UOh}X~Oh!WO~Oe!YO~Oe!ZO~O`!SOh}a~O`!UOh}a~Oh!_O~Oe~",
+ goto: "$b!PPPPP!QP!TP!TP!Y!`!hPPPP!TP!nPP!t!{P#QP#YPPPP#]#`#g#m#s#y$PPPPPP$V$[!TRQOVSQUVQdXRunScXnTeYrQmcRqeQfYR}rSzp|R!]!UVxp|!UURQUVRj^RhZRh]SUQVR`UQodRvoQ!TyR![!TQ!VzR!^!VQsfR!OsQ_RRk_VTQUVQ{pR!X|",
+ nodeNames: "⚠ TitleText LineComment RadarDiagram DiagramName : Title Keyword Axes Keyword Axis Name Label [ String ] , Curves Keyword Curve { Number Entry AxisRef } Option Keyword Boolean Keyword Keyword Keyword Keyword Graticule",
+ maxTerm: 50,
+ propSources: [radarHighlighting],
+ skippedNodes: [0,2],
+ repeatNodeCount: 6,
+ tokenData: ")R~RbXY!ZYZ!Z]^!Zpq!Zrs!luv$`wx$}|}&l!Q!R&q!R!['e![!]'p!c!}'u!}#O(m#P#Q(r#R#S'u#T#o'u#o#p(w#q#r(|~!`Sy~XY!ZYZ!Z]^!Zpq!Z~!oWOY!lZr!lrs#Xs#O!l#O#P#^#P;'S!l;'S;=`$Y<%lO!l~#^O^~~#aRO;'S!l;'S;=`#j;=`O!l~#mXOY!lZr!lrs#Xs#O!l#O#P#^#P;'S!l;'S;=`$Y;=`<%l!l<%lO!l~$]P;=`<%l!l~$cPuv$f~$kSQ~OY$fZ;'S$f;'S;=`$w<%lO$f~$zP;=`<%l$f~%QWOY$}Zw$}wx#Xx#O$}#O#P%j#P;'S$};'S;=`&f<%lO$}~%mRO;'S$};'S;=`%v;=`O$}~%yXOY$}Zw$}wx#Xx#O$}#O#P%j#P;'S$};'S;=`&f;=`<%l$}<%lO$}~&iP;=`<%l$}~&qO`~~&vQe~!O!P&|!Q!['[~'PP!Q!['S~'XPe~!Q!['S~'_Q!O!P&|!Q!['[~'jQe~!O!P&|!Q!['e~'uOT~~'zTz~}!O(Z!Q!['u!c!}'u#R#S'u#T#o'u~(^T}!O(Z!Q!['u!c!}'u#R#S'u#T#o'u~(rO]~~(wO_~~(|Od~~)ROh~",
+ tokenizers: [titleText, 0],
+ topRules: {"RadarDiagram":[0,3]},
+ specialized: [{term: 42, get: (value: keyof typeof spec_identifier) => spec_identifier[value] || -1}],
+ tokenPrec: 424
+})
diff --git a/packages/codemirror/src/languages/mermaid/parsers/radar/radar.grammar b/packages/codemirror/src/languages/mermaid/parsers/radar/radar.grammar
new file mode 100644
index 0000000000..5f6bb10ba4
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/radar/radar.grammar
@@ -0,0 +1,59 @@
+// Follows the Langium grammar of Mermaid's radar diagram (`@mermaid-js/parser`). Newlines are
+// skipped: Mermaid needs them only between statements, and `title` text ends at the line's end.
+@top RadarDiagram { DiagramName ":"? statement* }
+
+statement { Title | Axes | Curves | options }
+
+Title { kw<"title"> TitleText? }
+
+Axes { kw<"axis"> Axis ("," Axis)* }
+
+Axis { Name Label? }
+
+Curves { kw<"curve"> Curve ("," Curve)* }
+
+Curve { Name Label? "{" entries "}" }
+
+entries { Number ("," Number)* | Entry ("," Entry)* }
+
+Entry { AxisRef ":"? Number }
+
+Label { "[" String "]" }
+
+options { Option ("," Option)* }
+
+Option {
+ kw<"showLegend"> Boolean |
+ kw<"ticks"> Number |
+ kw<"max"> Number |
+ kw<"min"> Number |
+ kw<"graticule"> Graticule
+}
+
+Boolean { @specialize<identifier, "true"> | @specialize<identifier, "false"> }
+
+Graticule { @specialize<identifier, "circle"> | @specialize<identifier, "polygon"> }
+
+DiagramName { @specialize<identifier, "radar-beta"> }
+
+Name { identifier }
+
+AxisRef { identifier }
+
+kw<term> { @specialize[@name=Keyword]<identifier, term> }
+
+@skip { space | LineComment }
+
+@external tokens titleText from "./tokens.js" { TitleText }
+
+@tokens {
+ space { $[ \t\r\n]+ }
+ identifier { (@asciiLetter | "_") ($[a-zA-Z0-9_\-]* $[a-zA-Z0-9_])? }
+ Number { ("0" | $[1-9] @digit*) | @digit+ "." @digit+ }
+ String { '"' (!["\\\n] | "\\" _)* '"' | "'" (!['\\\n] | "\\" _)* "'" }
+ LineComment { "%%" ![\n]* }
+ ":" "," "[" "]" "{" "}"
+ @precedence { Number }
+}
+
+@external propSource radarHighlighting from "./highlight.js"
diff --git a/packages/codemirror/src/languages/mermaid/parsers/radar/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/radar/tokens.ts
new file mode 100644
index 0000000000..7ddf9d7db4
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/radar/tokens.ts
@@ -0,0 +1,4 @@
+import { lineText } from "../line_text.js";
+import { TitleText } from "./parser.terms.js";
+
+export const titleText = lineText(TitleText);
diff --git a/packages/codemirror/src/languages/mermaid/tags/index.ts b/packages/codemirror/src/languages/mermaid/tags/index.ts
index 5328bad317..7c543f749a 100644
--- a/packages/codemirror/src/languages/mermaid/tags/index.ts
+++ b/packages/codemirror/src/languages/mermaid/tags/index.ts
@@ -213,3 +213,19 @@ export const c4Tags = {
string: Tag.define(t.string),
lineComment: Tag.define(t.lineComment)
};
+
+export const radarTags = {
+ axisRef: Tag.define(t.variableName),
+ boolean: Tag.define(t.bool),
+ brace: Tag.define(t.brace),
+ diagramName: Tag.define(mermaidTags.diagramName),
+ graticule: Tag.define(t.atom),
+ keyword: Tag.define(t.keyword),
+ lineComment: Tag.define(t.lineComment),
+ name: Tag.define(t.variableName),
+ number: Tag.define(t.number),
+ separator: Tag.define(t.separator),
+ squareBracket: Tag.define(t.squareBracket),
+ 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.txt
index e2f1947d80..a15af3b115 100644
--- a/packages/codemirror/src/languages/mermaid/test/mermaid.txt
+++ b/packages/codemirror/src/languages/mermaid/test/mermaid.txt
@@ -368,3 +368,12 @@ gitGraph
==>
MermaidDiagram(GitDiagram(AccDescr(Keyword,"{",AccText,"}")))
+
+# Radar
+
+radar-beta
+ axis a
+
+==>
+
+MermaidDiagram(RadarDiagram(DiagramName,Axes(Keyword,Axis(Name))))
diff --git a/packages/codemirror/src/languages/mermaid/test/radar.txt b/packages/codemirror/src/languages/mermaid/test/radar.txt
new file mode 100644
index 0000000000..21de72de9f
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/test/radar.txt
@@ -0,0 +1,134 @@
+# Radar
+
+radar-beta
+
+==>
+
+RadarDiagram(DiagramName)
+
+# Trilium's sample
+
+radar-beta
+ axis m["Math"], s["Science"], e["English"]
+ axis h["History"], g["Geography"], a["Art"]
+ curve a["Alice"]{85, 90, 80, 70, 75, 90}
+ curve b["Bob"]{70, 75, 85, 80, 90, 85}
+
+ max 100
+ min 0
+
+==>
+
+RadarDiagram(DiagramName,
+ Axes(Keyword,Axis(Name,Label("[",String,"]")),",",Axis(Name,Label("[",String,"]")),",",Axis(Name,Label("[",String,"]"))),
+ Axes(Keyword,Axis(Name,Label("[",String,"]")),",",Axis(Name,Label("[",String,"]")),",",Axis(Name,Label("[",String,"]"))),
+ Curves(Keyword,Curve(Name,Label("[",String,"]"),"{",Number,",",Number,",",Number,",",Number,",",Number,",",Number,"}")),
+ Curves(Keyword,Curve(Name,Label("[",String,"]"),"{",Number,",",Number,",",Number,",",Number,",",Number,",",Number,"}")),
+ Option(Keyword,Number),
+ Option(Keyword,Number))
+
+# Title with a comment after it
+
+radar-beta
+ title Grades of the class %% a comment
+
+==>
+
+RadarDiagram(DiagramName,Title(Keyword,TitleText),LineComment)
+
+# Empty title
+
+radar-beta
+ title
+ axis a
+
+==>
+
+RadarDiagram(DiagramName,Title(Keyword),Axes(Keyword,Axis(Name)))
+
+# Entries by axis, over several lines
+
+radar-beta:
+ axis a, b
+ curve c{ a: 1, b 2.5 }, d {
+ 1,
+ 2
+ }
+
+==>
+
+RadarDiagram(DiagramName,":",
+ Axes(Keyword,Axis(Name),",",Axis(Name)),
+ Curves(Keyword,Curve(Name,"{",Entry(AxisRef,":",Number),",",Entry(AxisRef,Number),"}"),",",Curve(Name,"{",Number,",",Number,"}")))
+
+# Options
+
+radar-beta
+ showLegend false, ticks 5, graticule polygon
+ graticule circle
+ max 1.5
+
+==>
+
+RadarDiagram(DiagramName,
+ Option(Keyword,Boolean),",",Option(Keyword,Number),",",Option(Keyword,Graticule),
+ Option(Keyword,Graticule),
+ Option(Keyword,Number))
+
+# Single-quoted label and hyphenated name
+
+radar-beta
+ axis my-axis['Single']
+ %% a comment line
+
+==>
+
+RadarDiagram(DiagramName,Axes(Keyword,Axis(Name,Label("[",String,"]"))),LineComment)
+
+# Statement on the diagram line
+
+radar-beta axis a
+
+==>
+
+RadarDiagram(DiagramName,Axes(Keyword,Axis(Name)))
+
+# Keyword as a name (invalid)
+
+radar-beta
+ axis max
+ curve c{1}
+
+==>
+
+RadarDiagram(DiagramName,Axes(Keyword,⚠),Option(Keyword,⚠),Curves(Keyword,Curve(Name,"{",Number,"}")))
+
+# Numbers mixed with entries by axis (invalid)
+
+radar-beta
+ axis a
+ curve c{1, a: 2}
+
+==>
+
+RadarDiagram(DiagramName,Axes(Keyword,Axis(Name)),Curves(Keyword,Curve(Name,"{",Number,",",⚠,⚠(":"),Number,"}")))
+
+# Number with a leading zero (invalid)
+
+radar-beta
+ axis a
+ curve c{01}
+
+==>
+
+RadarDiagram(DiagramName,Axes(Keyword,Axis(Name)),Curves(Keyword,Curve(Name,"{",Number,⚠(Number),"}")))
+
+# Negative number (invalid)
+
+radar-beta
+ axis a
+ curve c{-1}
+
+==>
+
+RadarDiagram(DiagramName,Axes(Keyword,Axis(Name)),Curves(Keyword,Curve(Name,"{",⚠,Number,"}")))