Add PowerShell and Diff language modes

public/langdetect-worker.js

@@ -1,31 +1,6 @@
 importScripts("guesslang.min.js")
 
-GUESSLANG_LANGUAGES = [
-    "json",
-    "py",
-    "js",
-    "ts",
-    "html",
-    "sql",
-    "java",
-    "cpp",
-    "php",
-    "css",
-    "xml",
-    "rs",
-    "md",
-    "cs",
-    "rb",
-    "sh",
-    "yaml",
-    "go",
-    "clj",
-    "erl",
-    "toml",
-    "swift",
-    "kt",
-    "groovy",
-]
+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"]
 
 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" }
+    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" }
     Auto { "-a" }
     noteDelimiterEnter { "\n" }
     //NoteContent { String }

src/editor/lang-heynote/parser.js

@@ -10,7 +10,7 @@ export const parser = LRParser.deserialize({
   maxTerm: 10,
   skippedNodes: [0],
   repeatNodeCount: 1,
-  tokenData: ",p~RaYZ!W}!O!]#V#W!h#X#Y$U#Z#[$t#[#]%g#^#_%y#_#`'g#`#a(P#a#b(i#d#e)h#f#g*T#g#h*d#h#i+Y#l#m%m#m#n,X%&x%&y,_~!]OX~~!`P#T#U!c~!hOU~~!kR#`#a!t#d#e#i#g#h#o~!wP#c#d!z~!}P#^#_#Q~#TP#i#j#W~#ZP#f#g#^~#aP#X#Y#d~#iOT~~#lP#d#e#d~#rQ#[#]#x#g#h#d~#{P#T#U$O~$RP#f#g#i~$XP#f#g$[~$_P#`#a$b~$eP#T#U$h~$kP#b#c$n~$qP#Z#[#d~$wQ#c#d$[#f#g$}~%QP#c#d%T~%WP#c#d%Z~%^P#j#k%a~%dP#m#n#d~%jP#h#i%m~%pP#a#b%s~%vP#`#a#d~%|Q#T#U&S#g#h'W~&VP#j#k&Y~&]P#T#U&`~&ePT~#g#h&h~&kP#V#W&n~&qP#f#g&t~&wP#]#^&z~&}P#d#e'Q~'TP#h#i#d~'ZQ#c#d'a#l#m#d~'dP#b#c#d~'jP#c#d'm~'pP#h#i's~'vP#`#a'y~'|P#]#^'a~(SP#X#Y(V~(YP#n#o(]~(`P#X#Y(c~(fP#f#g#d~(lP#T#U(o~(rQ#f#g(x#h#i)b~({P#_#`)O~)RP#W#X)U~)XP#c#d)[~)_P#k#l'a~)eP#[#]#d~)kQ#[#]#i#m#n)q~)tP#h#i)w~)zP#[#])}~*QP#c#d'a~*WP#i#j*Z~*^Q#U#V%a#g#h'Q~*gR#[#]*p#e#f%s#k#l*|~*sP#X#Y*v~*yP#`#a%s~+PP#]#^+S~+VP#Y#Z'Q~+]S#X#Y+i#c#d%m#g#h+o#m#n+u~+lP#l#m'Q~+rP#l#m#d~+xP#d#e+{~,OP#X#Y,R~,UP#g#h&h~,[P#T#U%m~,bP%&x%&y,e~,hP%&x%&y,k~,pOY~",
+  tokenData: "-x~RbYZ!Z}!O!`#V#W!k#W#X$X#X#Y$k#Z#[%Z#[#]%|#^#_&`#_#`'|#`#a(f#a#b)O#d#e)}#f#g+i#g#h+x#h#i,b#l#m&S#m#n-a%&x%&y-g~!`OX~~!cP#T#U!f~!kOU~~!nR#`#a!w#d#e#l#g#h#r~!zP#c#d!}~#QP#^#_#T~#WP#i#j#Z~#^P#f#g#a~#dP#X#Y#g~#lOT~~#oP#d#e#g~#uQ#[#]#{#g#h#g~$OP#T#U$R~$UP#f#g#l~$[P#]#^$_~$bP#Y#Z$e~$hP#Y#Z#g~$nP#f#g$q~$tP#`#a$w~$zP#T#U$}~%QP#b#c%T~%WP#Z#[#g~%^Q#c#d$q#f#g%d~%gP#c#d%j~%mP#c#d%p~%sP#j#k%v~%yP#m#n#g~&PP#h#i&S~&VP#a#b&Y~&]P#`#a#g~&cQ#T#U&i#g#h'm~&lP#j#k&o~&rP#T#U&u~&zPT~#g#h&}~'QP#V#W'T~'WP#f#g'Z~'^P#]#^'a~'dP#d#e'g~'jP#h#i#g~'pQ#c#d'v#l#m#g~'yP#b#c#g~(PP#c#d(S~(VP#h#i(Y~(]P#`#a(`~(cP#]#^'v~(iP#X#Y(l~(oP#n#o(r~(uP#X#Y(x~({P#f#g#g~)RP#T#U)U~)XQ#f#g)_#h#i)w~)bP#_#`)e~)hP#W#X)k~)nP#c#d)q~)tP#k#l'v~)zP#[#]#g~*QR#[#]#l#c#d*Z#m#n+V~*^P#k#l*a~*dP#X#Y*g~*jP#f#g*m~*pP#g#h*s~*vP#[#]*y~*|P#X#Y+P~+SP#`#a&Y~+YP#h#i+]~+`P#[#]+c~+fP#c#d'v~+lP#i#j+o~+rQ#U#V%v#g#h'g~+{R#[#]*y#e#f&Y#k#l,U~,XP#]#^,[~,_P#Y#Z'g~,eS#X#Y,q#c#d&S#g#h,w#m#n,}~,tP#l#m'g~,zP#l#m#g~-QP#d#e-T~-WP#X#Y-Z~-^P#g#h&}~-dP#T#U&S~-jP%&x%&y-m~-pP%&x%&y-s~-xOY~",
   tokenizers: [0, noteContent],
   topRules: {"Document":[0,2]},
   tokenPrec: 0

src/editor/languages.js

@@ -24,6 +24,8 @@ import { toml } from "@codemirror/legacy-modes/mode/toml"
 import { swift } from "@codemirror/legacy-modes/mode/swift"
 import { kotlin } from "@codemirror/legacy-modes/mode/clike"
 import { groovy } from "@codemirror/legacy-modes/mode/groovy"
+import { diff } from "@codemirror/legacy-modes/mode/diff";
+import { powerShell } from "@codemirror/legacy-modes/mode/powershell";
 
 import typescriptPlugin from "prettier/plugins/typescript.mjs"
 import babelPrettierPlugin from "prettier/plugins/babel.mjs"
@@ -239,6 +241,18 @@ export const LANGUAGES = [
         parser: StreamLanguage.define(groovy).parser,
         guesslang: "groovy",
     }),
+    new Language({
+        token: "diff",
+        name: "Diff",
+        parser: StreamLanguage.define(diff).parser,
+        guesslang: null,
+    }),
+    new Language({
+        token: "powershell",
+        name: "PowerShell",
+        parser: StreamLanguage.define(powerShell).parser,
+        guesslang: "ps1",
+    }),
 ]
 
 

tsconfig.node.json

@@ -6,5 +6,5 @@
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true
   },
-  "include": ["vite.config.ts", "package.json", "electron", "shared-utils"]
+  "include": ["vite.config.mjs", "package.json", "electron", "shared-utils"]
 }

vite.config.ts → vite.config.mjs

@@ -1,3 +1,4 @@
+import * as fs from 'node:fs'
 import { rmSync } from 'node:fs'
 import { join } from 'node:path'
 import { defineConfig } from 'vite'
@@ -9,15 +10,14 @@ import pkg from './package.json'
 import path from 'path'
 
 import { keyHelpStr } from "./shared-utils/key-helper";
+import { LANGUAGES }  from "./src/editor/languages"
 
 rmSync('dist-electron', { recursive: true, force: true })
 
 const isDevelopment = process.env.NODE_ENV === "development" || !!process.env.VSCODE_DEBUG
 const isProduction = process.env.NODE_ENV === "production"
 
 const updateReadmeKeybinds = async () => {
-	const fs = require('fs')
-	const path = require('path')
 	const readmePath = path.resolve(__dirname, 'README.md')
 	let readme = fs.readFileSync(readmePath, 'utf-8')
 	const keybindsRegex = /^(### What are the default keyboard shortcuts\?\s*).*?^(```\s+#)/gms
@@ -32,11 +32,20 @@ ${keyHelpStr('darwin')}
 \`\`\`
 ${keyHelpStr('win32')}
 $2`
-
 	readme = readme.replace(keybindsRegex, shortcuts)
 	fs.writeFileSync(readmePath, readme)
 }
 
+const updateGuesslangLanguagesInWebWorker = async () => {
+	const langDetectWorkerPath = path.resolve(__dirname, 'public', 'langdetect-worker.js')
+	let workerFileContents = fs.readFileSync(langDetectWorkerPath, 'utf-8')
+	const langListRegex = /^GUESSLANG_LANGUAGES = \[[^\]]+\]/gms
+	const newLangList = JSON.stringify(LANGUAGES.map(l => l.guesslang).filter(l => l !== null))
+	workerFileContents = workerFileContents.replace(langListRegex, `GUESSLANG_LANGUAGES = ${newLangList}`)
+	fs.writeFileSync(langDetectWorkerPath, workerFileContents)
+}
+
+
 // https://vitejs.dev/config/
 export default defineConfig({
 	resolve: {
@@ -48,6 +57,7 @@ export default defineConfig({
 	plugins: [
 		vue(),
 		updateReadmeKeybinds(),
+		updateGuesslangLanguagesInWebWorker(),
 		electron([
 			{
 				// Main-Process entry file of the Electron App.