Improve, add example.

savonet · Oct 26, 2023 · 26d1b04 · 26d1b04
1 parent e276ec7
commit 26d1b04
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 58 deletions.
diff --git a/examples/dist b/examples/dist
@@ -0,0 +1 @@
+../dist
diff --git a/examples/index.html b/examples/index.html
@@ -0,0 +1,40 @@
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <script type="importmap">
+      {
+        "imports": {
+          "codemirror": "https://esm.sh/[email protected]",
+          "@codemirror/state": "https://esm.sh/@codemirror/[email protected]",
+          "@uiw/codemirror-theme-github": "https://esm.sh/@uiw/[email protected]",
+          "@codemirror/language": "https://esm.sh/@codemirror/[email protected]",
+          "@lezer/highlight": "https://esm.sh/@lezer/[email protected]",
+          "@lezer/lr": "https://esm.sh/@lezer/[email protected]",
+          "codemirror-lang-liquidsoap": "./dist/index.js"
+        }
+      }
+    </script>
+    <script type="module">
+      import { basicSetup, EditorView } from "codemirror";
+      import { githubLight } from "@uiw/codemirror-theme-github";
+      import { liquidsoap } from "codemirror-lang-liquidsoap";
+
+      new EditorView({
+        doc: `# ✨ Welcome to liquidsoap's test editor! ✨
+#  Write your code here:
+
+`,
+        extensions: [
+          basicSetup,
+          liquidsoap(),
+          githubLight
+        ],
+        parent:  document.getElementById("editor")
+      });
+
+    </script>
+  </head>
+  <body>
+    <div id="editor"></div>
+  </body>
+</html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror-lang-liquidsoap",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Liquidsoap language support for prosemirror",
   "main": "dist/index.cjs",
   "bin": {
@@ -17,6 +17,8 @@
   "license": "MIT",
   "devDependencies": {
     "@lezer/generator": "^1.0.0",
+    "codemirror": "^6.0.1",
+    "prettier": "^3.0.3",
     "rollup": "^2.60.2",
     "rollup-plugin-dts": "^4.0.1",
     "rollup-plugin-preserve-shebang": "^1.0.1",
@@ -41,6 +43,7 @@
   "scripts": {
     "build": "lezer-generator src/liquidsoap.grammar -o src/parser && rollup -c && chmod +x dist/cli.js",
     "test": "./tests/run.sh",
+    "format": "pnpm prettier -w src/*.ts src/*.js",
     "prepare": "npm run build"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.ts b/src/index.ts
@@ -8,28 +8,39 @@ export const LiquidsoapLanguage = LRLanguage.define({
     props: [
       styleTags({
         Var: t.variableName,
-        Type: t.typeName,
+        "Type/...": t.typeName,
         Bool: t.bool,
         String: t.string,
-        Method: t.propertyName,
-        LabeledArgument: t.labelName,
+        "Method/...": t.propertyName,
+        "LabeledArgument/...": t.labelName,
         Integer: t.integer,
         Float: t.float,
         Regexp: t.regexp,
         EscapedChar: t.escape,
         Op: t.operatorKeyword,
+        "LetDecoration/...": t.modifier,
+        "Defined/Var": t.definition(t.variableName),
+        "Defined/Varlpar": t.definition(t.function(t.variableName)),
+        "Defined/Subfield/*/Var": t.definition(t.propertyName),
+        "Defined/SubfieldLpar/*/Varlpar": t.definition(
+          t.function(t.propertyName),
+        ),
+        "SubfieldLpar/*/Varlpar": t.function(t.propertyName),
+        Varlpar: t.function(t.variableName),
         LineComment: t.lineComment,
         BlockComment: t.blockComment,
-        ControlKeyword: t.controlKeyword,
-        Keyword: t.keyword,
-        DefinitionKeyword: t.definitionKeyword,
-        LogicOperator: t.logicOperator,
-        CompareOperator: t.compareOperator,
-        ArithmeticOperator: t.arithmeticOperator,
+        DocComment: t.docComment,
+        "ControlKeyword/...": t.controlKeyword,
+        "Keyword/...": t.keyword,
+        "DefinitionKeyword/...": t.definitionKeyword,
+        "LogicOperator/...": t.logicOperator,
+        "CompareOperator/...": t.compareOperator,
+        "ArithmeticOperator/...": t.arithmeticOperator,
         DerefOp: t.derefOperator,
         UpdateOp: t.updateOperator,
         "( )": t.paren,
-        "[ ]": t.bracket,
+        "{ }": t.brace,
+        "[ ]": t.squareBracket,
       }),
     ],
   }),