thememirror and syntax highlighting

RockstarLang · Jul 4, 2024 · bc24624 · bc24624
1 parent 2eacf17
commit bc24624
Show file tree

Hide file tree

Showing 7 changed files with 1,073 additions and 28 deletions.
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
@@ -148,17 +148,17 @@
   },
   "active": "af9edaf1541aa592",
   "lastOpenFiles": [
+    "codemirror-lang-rockstar/pnpm-lock.yaml.3042434986",
+    "codemirror-lang-rockstar/_tmp_46436_89968ddaabae1b280b8a0168b939c989",
+    "codemirror-lang-rockstar/package.json.902345379",
+    "codemirror-lang-rockstar/pnpm-lock.yaml.3146977705",
+    "codemirror-lang-rockstar/_tmp_10912_1fe8be06afbd0bb33b1e1728551a1d95",
+    "codemirror-lang-rockstar/src/highlight.js",
     "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Text.RegularExpressions.wasm.gz",
     "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Text.RegularExpressions.wasm.br",
     "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Text.RegularExpressions.wasm",
     "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Runtime.wasm.gz",
     "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Runtime.wasm.br",
-    "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Runtime.wasm",
-    "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Runtime.InteropServices.wasm.gz",
-    "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Runtime.InteropServices.wasm.br",
-    "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Runtime.InteropServices.wasm",
-    "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Runtime.InteropServices.JavaScript.wasm.gz",
-    "codewithrockstar.com/_site/wasm/wwwroot/framework/System.Runtime.InteropServices.JavaScript.wasm.br",
     "codewithrockstar.com/getting-started.md",
     "codewithrockstar.com/index copy.md"
   ]

diff --git a/codemirror-lang-rockstar/package.json b/codemirror-lang-rockstar/package.json
@@ -16,17 +16,18 @@
   "types": "dist/rockstar.d.ts",
   "sideEffects": false,
   "dependencies": {
-	"@codemirror/state": "^6.0.0",
-	"@codemirror/view": "^6.0.0",
-	"@codemirror/autocomplete": "^6.17.0",
+    "@codemirror/autocomplete": "^6.17.0",
     "@codemirror/language": "^6.0.0",
+    "@codemirror/state": "^6.0.0",
+    "@codemirror/view": "^6.0.0",
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.0.0",
-	"codemirror": "^6.0.1"
+    "codemirror": "^6.0.1",
+    "thememirror": "^2.0.1"
   },
   "devDependencies": {
-	"@rollup/plugin-node-resolve": "^15.2.3",
     "@lezer/generator": "^1.0.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "mocha": "^9.0.1",
     "rollup": "^2.60.2",
     "rollup-plugin-dts": "^4.0.1",

diff --git a/codemirror-lang-rockstar/pnpm-lock.yaml b/codemirror-lang-rockstar/pnpm-lock.yaml
diff --git a/codemirror-lang-rockstar/src/codemirror-lang-rockstar.ts b/codemirror-lang-rockstar/src/codemirror-lang-rockstar.ts
@@ -1,6 +1,6 @@
 import {parser} from "./rockstar.grammar"
 import {LRLanguage, LanguageSupport, indentNodeProp, foldNodeProp, foldInside, delimitedIndent} from "@codemirror/language"
-import {styleTags, tags as t} from "@lezer/highlight"
+// import {styleTags, tags as t} from "@lezer/highlight"
 import { completeFromList } from "@codemirror/autocomplete"
 
 export const RockstarLanguage = LRLanguage.define({
@@ -12,13 +12,13 @@ export const RockstarLanguage = LRLanguage.define({
       foldNodeProp.add({
         Application: foldInside
       }),
-      styleTags({
-        Identifier: t.variableName,
-        Boolean: t.bool,
-        String: t.string,
-        Comment: t.comment,
-        "( )": t.paren
-      })
+    //   styleTags({
+    //     Identifier: t.variableName,
+    //     Boolean: t.bool,
+    //     String: t.string,
+    //     Comment: t.comment,
+    //     "( )": t.paren
+    //   })
     ]
   }),
   languageData: {

diff --git a/codemirror-lang-rockstar/src/rockstar-editor.mjs b/codemirror-lang-rockstar/src/rockstar-editor.mjs
@@ -1,10 +1,11 @@
 import { EditorView, basicSetup } from "codemirror"
 import { Rockstar } from "./codemirror-lang-rockstar.ts"
+import {coolGlow} from 'thememirror';
 
 export function replaceElementWithEditor(element, RunRockstarProgram) {
 	let view = new EditorView({
 		doc: element.innerText,
-		extensions: [basicSetup, Rockstar()],
+		extensions: [basicSetup, coolGlow, Rockstar()],
 	});
 	element.parentNode.insertBefore(view.dom, element);
 	let button = document.createElement("button");

diff --git a/codemirror-lang-rockstar/src/rockstar.grammar b/codemirror-lang-rockstar/src/rockstar.grammar
@@ -1,3 +1,5 @@
+@external propSource highlighting from "./highlight.js"
+
 @top Program { expression* }
 
 @skip { space | Comment }