variables and templates

src/lib/plantumlLanguage.ts

@@ -1,9 +1,47 @@
 import { StreamLanguage } from '@codemirror/language'
 
-/** Simple PlantUML stream parser for syntax highlighting in CodeMirror */
+/** Nunjucks block comment {# ... #} */
+function tokenNunjucksComment(stream: { match: (re: RegExp) => string | null; next: () => string; eol: () => boolean }) {
+    if (stream.match(/^\{#/)) {
+        while (!stream.eol()) {
+            if (stream.match(/#\}/)) return 'comment'
+            stream.next()
+        }
+        return 'comment'
+    }
+    return null
+}
+
+/** Nunjucks variable {{ ... }} or tag {% ... %} - tokenize the whole block */
+function tokenNunjucksBlock(stream: { match: (re: RegExp) => string | null; next: () => string; eol: () => boolean }) {
+    if (stream.match(/^\{\{/)) {
+        while (!stream.eol()) {
+            if (stream.match(/\}\}/)) return 'variableName.special'
+            stream.next()
+        }
+        return 'variableName.special'
+    }
+    if (stream.match(/^\{\%/)) {
+        while (!stream.eol()) {
+            if (stream.match(/%\}/)) return 'keyword'
+            stream.next()
+        }
+        return 'keyword'
+    }
+    return null
+}
+
+/** Simple PlantUML + Nunjucks stream parser for syntax highlighting in CodeMirror */
 const plantumlParser = StreamLanguage.define({
     name: 'plantuml',
     token(stream) {
+        // Nunjucks {# ... #} comment
+        const nunjucksComment = tokenNunjucksComment(stream)
+        if (nunjucksComment) return nunjucksComment
+        // Nunjucks {{ }} and {% %}
+        const nunjucksBlock = tokenNunjucksBlock(stream)
+        if (nunjucksBlock) return nunjucksBlock
+
         // Single-quote line comment (PlantUML)
         if (stream.match(/^'/)) {
             stream.skipToEnd()