Fixed misspelling & added fish shell support, keywords only

main.ts

@@ -32,6 +32,7 @@ import './mode/elm/elm'
 import './mode/erlang/erlang'
 import './mode/factor/factor'
 import './mode/fcl/fcl'
+import './mode/fish/fish'
 import './mode/forth/forth'
 import './mode/fortran/fortran'
 import './mode/gas/gas'
@@ -158,4 +159,4 @@ export default class CMSyntaxHighlightPlugin extends Plugin {
     // re-set the editor mode to refresh the syntax highlighting
     this.app.workspace.iterateCodeMirrors(cm => cm.setOption("mode", cm.getOption("mode")))
   }
-}
+}

mode/fish/fish.js

@@ -0,0 +1,152 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode('fish', function() {
+
+    var words = {};
+    function define(style, dict) {
+      for(var i = 0; i < dict.length; i++) {
+        words[dict[i]] = style;
+      }
+    };
+
+    var commonAtoms = ["true", "false"];
+    var commonKeywords = ["if", "then", "do", "else", "elif", "while", "until", "for", "in", "esac", "fi",
+      "fin", "fil", "done", "exit", "set", "unset", "export", "function","eval","end","test"];
+    var commonCommands = ["ab", "awk", "bash", "beep", "cat", "cc", "cd", "chown", "chmod", "chroot", "clear",
+      "cp", "curl", "cut", "diff", "echo", "find", "gawk", "gcc", "get", "git", "grep", "hg", "kill", "killall",
+      "ln", "ls", "make", "mkdir", "openssl", "mv", "nc", "nl", "node", "npm", "ping", "ps", "restart", "rm",
+      "rmdir", "sed", "service", "sh", "shopt", "shred", "source", "sort", "sleep", "ssh", "start", "stop",
+      "su", "sudo", "svn", "tee", "telnet", "top", "touch", "vi", "vim", "wall", "wc", "wget", "who", "write",
+      "yes", "zsh"];
+
+    CodeMirror.registerHelper("hintWords", "fish", commonAtoms.concat(commonKeywords, commonCommands));
+
+    define('atom', commonAtoms);
+    define('keyword', commonKeywords);
+    define('builtin', commonCommands);
+
+    function tokenBase(stream, state) {
+      if (stream.eatSpace()) return null;
+
+      var sol = stream.sol();
+      var ch = stream.next();
+
+      if (ch === '\\') {
+        stream.next();
+        return null;
+      }
+      if (ch === '\'' || ch === '"' || ch === '`') {
+        state.tokens.unshift(tokenString(ch, ch === "`" ? "quote" : "string"));
+        return tokenize(stream, state);
+      }
+      if (ch === '#') {
+        if (sol && stream.eat('!')) {
+          stream.skipToEnd();
+          return 'meta'; // 'comment'?
+        }
+        stream.skipToEnd();
+        return 'comment';
+      }
+      if (ch === '$') {
+        state.tokens.unshift(tokenDollar);
+        return tokenize(stream, state);
+      }
+      if (ch === '+' || ch === '=') {
+        return 'operator';
+      }
+      if (ch === '-') {
+        stream.eat('-');
+        stream.eatWhile(/\w/);
+        return 'attribute';
+      }
+      if (/\d/.test(ch)) {
+        stream.eatWhile(/\d/);
+        if(stream.eol() || !/\w/.test(stream.peek())) {
+          return 'number';
+        }
+      }
+      stream.eatWhile(/[\w-]/);
+      var cur = stream.current();
+      if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
+      return words.hasOwnProperty(cur) ? words[cur] : null;
+    }
+
+    function tokenString(quote, style) {
+      var close = quote == "(" ? ")" : quote == "{" ? "}" : quote
+      return function(stream, state) {
+        var next, escaped = false;
+        while ((next = stream.next()) != null) {
+          if (next === close && !escaped) {
+            state.tokens.shift();
+            break;
+          } else if (next === '$' && !escaped && quote !== "'" && stream.peek() != close) {
+            escaped = true;
+            stream.backUp(1);
+            state.tokens.unshift(tokenDollar);
+            break;
+          } else if (!escaped && quote !== close && next === quote) {
+            state.tokens.unshift(tokenString(quote, style))
+            return tokenize(stream, state)
+          } else if (!escaped && /['"]/.test(next) && !/['"]/.test(quote)) {
+            state.tokens.unshift(tokenStringStart(next, "string"));
+            stream.backUp(1);
+            break;
+          }
+          escaped = !escaped && next === '\\';
+        }
+        return style;
+      };
+    };
+
+    function tokenStringStart(quote, style) {
+      return function(stream, state) {
+        state.tokens[0] = tokenString(quote, style)
+        stream.next()
+        return tokenize(stream, state)
+      }
+    }
+
+    var tokenDollar = function(stream, state) {
+      if (state.tokens.length > 1) stream.eat('$');
+      var ch = stream.next()
+      if (/['"({]/.test(ch)) {
+        state.tokens[0] = tokenString(ch, ch == "(" ? "quote" : ch == "{" ? "def" : "string");
+        return tokenize(stream, state);
+      }
+      if (!/\d/.test(ch)) stream.eatWhile(/\w/);
+      state.tokens.shift();
+      return 'def';
+    };
+
+    function tokenize(stream, state) {
+      return (state.tokens[0] || tokenBase) (stream, state);
+    };
+
+    return {
+      startState: function() {return {tokens:[]};},
+      token: function(stream, state) {
+        return tokenize(stream, state);
+      },
+      closeBrackets: "()[]{}''\"\"``",
+      lineComment: '#',
+      fold: "brace"
+    };
+  });
+
+  CodeMirror.defineMIME('text/x-fish', 'fish');
+  // Apache uses a slightly different Media Type for fish Shell scripts
+  // http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
+  CodeMirror.defineMIME('application/x-fish', 'fish');
+
+});

mode/meta.js

@@ -38,6 +38,7 @@
     {name: "Esper", mime: "text/x-esper", mode: "sql"},
     {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
     {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
+    {name: "Fish", mimes: ["text/x-fish", "application/x-fish"], mode: "fish", ext: ["fish"], alias: [], file: /^PKGBUILD$/},
     {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
     {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90", "f95"]},
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},

mode/shell/shell.js

@@ -22,7 +22,7 @@ CodeMirror.defineMode('shell', function() {
 
   var commonAtoms = ["true", "false"];
   var commonKeywords = ["if", "then", "do", "else", "elif", "while", "until", "for", "in", "esac", "fi",
-    "fin", "fil", "done", "exit", "set", "unset", "export", "function"];
+    "fin", "fil", "done", "exit", "set", "unset", "export", "function","eval","end","test"];
   var commonCommands = ["ab", "awk", "bash", "beep", "cat", "cc", "cd", "chown", "chmod", "chroot", "clear",
     "cp", "curl", "cut", "diff", "echo", "find", "gawk", "gcc", "get", "git", "grep", "hg", "kill", "killall",
     "ln", "ls", "make", "mkdir", "openssl", "mv", "nc", "nl", "node", "npm", "ping", "ps", "restart", "rm",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cm-editor-syntax-highlight-obsidian",
   "version": "0.1.3",
-  "description": "Show syntax highlighing in code blocks the editor",
+  "description": "Show syntax highlighting in code blocks the editor",
   "main": "main.js",
   "scripts": {
     "install-deps": "npm install",