Add Elixir support

docs/changelog.md

@@ -72,6 +72,7 @@ Apart from the default Scratch buffer, you can now create and switch between mul
   * TOML
   * C#
   * Clojure
+  * Elixir
   * Erlang
   * Golang
   * Lezer

docs/index.md

@@ -14,7 +14,7 @@ Available for Mac, Windows, and Linux.
 -   Block-based
 -   Syntax highlighting:
 
-    C++, C#, Clojure, CSS, Erlang, Dart, Go, Groovy, HTML, Java, JavaScript, JSX, Kotlin, TypeScript, TOML, TSX, JSON, Lezer, Markdown, PHP, Python, Ruby, Rust, Shell, SQL, Swift, Vue, XML, YAML
+    C++, C#, Clojure, CSS, Elixir, Erlang, Dart, Go, Groovy, HTML, Java, JavaScript, JSX, Kotlin, TypeScript, TOML, TSX, JSON, Lezer, Markdown, PHP, Python, Ruby, Rust, Shell, SQL, Swift, Vue, XML, YAML
 
 -   Language auto-detection
 -   Auto-formatting

package.json

@@ -60,13 +60,15 @@
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@types/node": "^20.10.5",
     "@vitejs/plugin-vue": "^4.0.0",
+    "codemirror-lang-elixir": "^4.0.0",
     "debounce": "^1.2.1",
     "electron": "^31.1.0",
     "electron-builder": "^23.6.0",
     "electron-builder-notarize": "^1.5.1",
     "electron-store": "^8.1.0",
     "electron-updater": "^6.1.7",
     "fs-jetpack": "^5.1.0",
+    "lezer-elixir": "^1.1.2",
     "prettier": "^3.3.2",
     "rollup-plugin-license": "^3.0.1",
     "sass": "^1.57.1",

public/langdetect-worker.js

@@ -1,6 +1,6 @@
 importScripts("guesslang.min.js")
 
-GUESSLANG_LANGUAGES = ["json","py","html","sql","md","java","php","css","xml","cpp","rs","cs","rb","sh","yaml","toml","go","clj","erl","js","ts","swift","kt","groovy","ps1","dart"]
+GUESSLANG_LANGUAGES = ["json","py","html","sql","md","java","php","css","xml","cpp","rs","cs","rb","sh","yaml","toml","go","clj","ex","erl","js","ts","swift","kt","groovy","ps1","dart"]
 
 const guessLang = new self.GuessLang()
 

src/editor/lang-heynote/heynote.grammar

@@ -11,7 +11,7 @@ NoteDelimiter {
 
 @tokens {
     noteDelimiterMark { "∞∞∞" }
-    NoteLanguage { "text" | "math" | "javascript" | "typescript" | "jsx" | "tsx" | "json" | "python" | "html" | "sql" | "markdown" | "java" | "php" | "css" | "xml" | "cpp" | "rust" | "csharp" | "ruby" | "shell" | "yaml" | "golang" | "clojure" | "erlang" | "lezer" | "toml" | "swift" | "kotlin" | "groovy" | "diff" | "powershell" | "vue" | "dart" }
+    NoteLanguage { "text" | "math" | "javascript" | "typescript" | "jsx" | "tsx" | "json" | "python" | "html" | "sql" | "markdown" | "java" | "php" | "css" | "xml" | "cpp" | "rust" | "csharp" | "ruby" | "shell" | "yaml" | "golang" | "clojure" | "elixir" | "erlang" | "lezer" | "toml" | "swift" | "kotlin" | "groovy" | "diff" | "powershell" | "vue" | "dart" }
     Auto { "-a" }
     noteDelimiterEnter { "\n" }
     //NoteContent { String }

src/editor/lang-heynote/nested-parser.js

@@ -1,41 +1,46 @@
-import { parseMixed } from "@lezer/common"
+import { parseMixed } from "@lezer/common";
 
-import { jsonLanguage } from "@codemirror/lang-json"
-import { pythonLanguage } from "@codemirror/lang-python"
-import { javascriptLanguage } from "@codemirror/lang-javascript"
-import { htmlLanguage } from "@codemirror/lang-html"
-import { StandardSQL } from "@codemirror/lang-sql"
-import { markdownLanguage } from "@codemirror/lang-markdown"
-import { javaLanguage } from "@codemirror/lang-java"
-import { lezerLanguage } from "@codemirror/lang-lezer"
-import { phpLanguage } from "@codemirror/lang-php"
+import { jsonLanguage } from "@codemirror/lang-json";
+import { pythonLanguage } from "@codemirror/lang-python";
+import { javascriptLanguage } from "@codemirror/lang-javascript";
+import { htmlLanguage } from "@codemirror/lang-html";
+import { StandardSQL } from "@codemirror/lang-sql";
+import { markdownLanguage } from "@codemirror/lang-markdown";
+import { javaLanguage } from "@codemirror/lang-java";
+import { lezerLanguage } from "@codemirror/lang-lezer";
+import { phpLanguage } from "@codemirror/lang-php";
+import { elixirLanguage } from "codemirror-lang-elixir";
 
-import { NoteContent, NoteLanguage } from "./parser.terms.js"
-import { LANGUAGES } from "../languages.js"
-
-const languageMapping = Object.fromEntries(LANGUAGES.map(l => [l.token, l.parser]))
+import { NoteContent, NoteLanguage } from "./parser.terms.js";
+import { LANGUAGES } from "../languages.js";
 
+const languageMapping = Object.fromEntries(
+  LANGUAGES.map((l) => [l.token, l.parser]),
+);
 
 export function configureNesting() {
-    return parseMixed((node, input) => {
-        let id = node.type.id
-        if (id == NoteContent) {
-            let noteLang = node.node.parent.firstChild.getChildren(NoteLanguage)[0]
-            let langName = input.read(noteLang?.from, noteLang?.to)
-
-            // if the NoteContent is empty, we don't want to return a parser, since that seems to cause an 
-            // error for StreamLanguage parsers when the buffer size is large (e.g >300 kb)
-            if (node.node.from == node.node.to) {
-                return null
-            }
-
-            if (langName in languageMapping && languageMapping[langName] !== null) {
-                //console.log("found parser for language:", langName)
-                return {
-                    parser:languageMapping[langName],
-                }
-            }
-        }
-        return null
-    })
+  return parseMixed((node, input) => {
+    let id = node.type.id;
+    if (id == NoteContent) {
+      let noteLang = node.node.parent.firstChild.getChildren(NoteLanguage)[0];
+      let langName = input.read(noteLang?.from, noteLang?.to);
+
+      // if the NoteContent is empty, we don't want to return a parser, since that seems to cause an
+      // error for StreamLanguage parsers when the buffer size is large (e.g >300 kb)
+      if (node.node.from == node.node.to) {
+        return null;
+      }
+
+      if (
+        langName in languageMapping &&
+        languageMapping[langName] !== null
+      ) {
+        //console.log("found parser for language:", langName)
+        return {
+          parser: languageMapping[langName],
+        };
+      }
+    }
+    return null;
+  });
 }

src/editor/lang-heynote/parser.js

@@ -10,7 +10,7 @@ export const parser = LRParser.deserialize({
   maxTerm: 10,
   skippedNodes: [0],
   repeatNodeCount: 1,
-  tokenData: ".[~RcYZ!^}!O!c#V#W!n#W#X$[#X#Y$}#Z#[%m#[#]&`#^#_&r#_#`(Y#`#a(r#a#b)[#d#e*Z#f#g+u#g#h,U#h#i,n#j#k-m#l#m&f#m#n-s%&x%&y-y~!cOX~~!fP#T#U!i~!nOU~~!qR#`#a!z#d#e#o#g#h#u~!}P#c#d#Q~#TP#^#_#W~#ZP#i#j#^~#aP#f#g#d~#gP#X#Y#j~#oOT~~#rP#d#e#j~#xQ#[#]$O#g#h#j~$RP#T#U$U~$XP#f#g#o~$_Q#T#U$e#]#^$q~$hP#f#g$k~$nP#h#i#j~$tP#Y#Z$w~$zP#Y#Z#j~%QP#f#g%T~%WP#`#a%Z~%^P#T#U%a~%dP#b#c%g~%jP#Z#[#j~%pQ#c#d%T#f#g%v~%yP#c#d%|~&PP#c#d&S~&VP#j#k&Y~&]P#m#n#j~&cP#h#i&f~&iP#a#b&l~&oP#`#a#j~&uQ#T#U&{#g#h'y~'OP#j#k'R~'UP#T#U'X~'^PT~#g#h'a~'dP#V#W'g~'jP#f#g'm~'pP#]#^'s~'vP#d#e$k~'|Q#c#d(S#l#m#j~(VP#b#c#j~(]P#c#d(`~(cP#h#i(f~(iP#`#a(l~(oP#]#^(S~(uP#X#Y(x~({P#n#o)O~)RP#X#Y)U~)XP#f#g#j~)_P#T#U)b~)eQ#f#g)k#h#i*T~)nP#_#`)q~)tP#W#X)w~)zP#c#d)}~*QP#k#l(S~*WP#[#]#j~*^R#[#]#o#c#d*g#m#n+c~*jP#k#l*m~*pP#X#Y*s~*vP#f#g*y~*|P#g#h+P~+SP#[#]+V~+YP#X#Y+]~+`P#`#a&l~+fP#h#i+i~+lP#[#]+o~+rP#c#d(S~+xP#i#j+{~,OQ#U#V&Y#g#h$k~,XR#[#]+V#e#f&l#k#l,b~,eP#]#^,h~,kP#Y#Z$k~,qS#X#Y,}#c#d&f#g#h-T#m#n-Z~-QP#l#m$k~-WP#l#m#j~-^P#d#e-a~-dP#X#Y-g~-jP#g#h'a~-pP#i#j#d~-vP#T#U&f~-|P%&x%&y.P~.SP%&x%&y.V~.[OY~",
+  tokenData: ".q~RcYZ!^}!O!c#V#W!n#W#X$[#X#Y$}#Z#[&Y#[#]&{#^#_'_#_#`(u#`#a)_#a#b)q#d#e*p#f#g,[#g#h,k#h#i-T#j#k.S#l#m'R#m#n.Y%&x%&y.`~!cOX~~!fP#T#U!i~!nOU~~!qR#`#a!z#d#e#o#g#h#u~!}P#c#d#Q~#TP#^#_#W~#ZP#i#j#^~#aP#f#g#d~#gP#X#Y#j~#oOT~~#rP#d#e#j~#xQ#[#]$O#g#h#j~$RP#T#U$U~$XP#f#g#o~$_Q#T#U$e#]#^$q~$hP#f#g$k~$nP#h#i#j~$tP#Y#Z$w~$zP#Y#Z#j~%QQ#`#a%W#f#g%p~%ZP#]#^%^~%aP#l#m%d~%gP#]#^%j~%mP#f#g#j~%sP#`#a%v~%yP#T#U%|~&PP#b#c&S~&VP#Z#[#j~&]Q#c#d%p#f#g&c~&fP#c#d&i~&lP#c#d&o~&rP#j#k&u~&xP#m#n#j~'OP#h#i'R~'UP#a#b'X~'[P#`#a#j~'bQ#T#U'h#g#h(f~'kP#j#k'n~'qP#T#U't~'yPT~#g#h'|~(PP#V#W(S~(VP#f#g(Y~(]P#]#^(`~(cP#d#e$k~(iQ#c#d(o#l#m#j~(rP#b#c#j~(xP#c#d({~)OP#h#i)R~)UP#`#a)X~)[P#]#^(o~)bP#X#Y)e~)hP#n#o)k~)nP#X#Y%j~)tP#T#U)w~)zQ#f#g*Q#h#i*j~*TP#_#`*W~*ZP#W#X*^~*aP#c#d*d~*gP#k#l(o~*mP#[#]#j~*sR#[#]#o#c#d*|#m#n+x~+PP#k#l+S~+VP#X#Y+Y~+]P#f#g+`~+cP#g#h+f~+iP#[#]+l~+oP#X#Y+r~+uP#`#a'X~+{P#h#i,O~,RP#[#],U~,XP#c#d(o~,_P#i#j,b~,eQ#U#V&u#g#h$k~,nR#[#]+l#e#f'X#k#l,w~,zP#]#^,}~-QP#Y#Z$k~-WS#X#Y-d#c#d'R#g#h-j#m#n-p~-gP#l#m$k~-mP#l#m#j~-sP#d#e-v~-yP#X#Y-|~.PP#g#h'|~.VP#i#j#d~.]P#T#U'R~.cP%&x%&y.f~.iP%&x%&y.l~.qOY~",
   tokenizers: [0, noteContent],
   topRules: {"Document":[0,2]},
   tokenPrec: 0