[clojure mode] Highlight all reader macro characters with meta.

Author: Abdussalam Abdurrahman

mode/clojure/clojure.js

@@ -152,10 +152,10 @@ CodeMirror.defineMode("clojure", function (options) {
   var atom = createLookupMap(commonAtoms);
   var specialForm = createLookupMap(commonSpecialForms);
   var coreSymbol = createLookupMap(commonCoreSymbols);
-  var indentSymbol = createLookupMap(commonIndentSymbols);;
+  var indentSymbol = createLookupMap(commonIndentSymbols);
   var assumeBody = /^(?:def|with)[^\/]+$|\/(?:def|with)/;
   var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
-  var symbol = /[\w*+!\-._?:<>\/'\xa1-\uffff]/;
+  var symbol = /[!#'*+\-.\/:<>?_\w\xa1-\uffff]/;
 
   var tokenType;
 
@@ -170,16 +170,15 @@ CodeMirror.defineMode("clojure", function (options) {
     if (ch === "(" || ch === "[" || ch === "{") {tokenType = "open"; return "bracket";}
     if (ch === ")" || ch === "]" || ch === "}") {tokenType = "close"; return "bracket";}
     if (ch === ";") {stream.skipToEnd(); tokenType = "space"; return "comment";}
-    if (/['`~@]/.test(ch)) return "atom";
-    if (/[#^]/.test(ch)) return "meta"
+    if (/[#'@^`~]/.test(ch)) return "meta";
 
     var name = readSymbol(stream);
     tokenType = "symbol";
 
     if (atom.propertyIsEnumerable(name) || name.charAt(0) === ":") return "atom";
     if (specialForm.propertyIsEnumerable(name) ||
       coreSymbol.propertyIsEnumerable(name)) return "keyword";
-    if (state.lastToken === "(") return "builtin";
+    if (state.lastToken === "(") return "builtin";  // head symbol
 
     return "variable";
   }
@@ -230,7 +229,7 @@ CodeMirror.defineMode("clojure", function (options) {
       tokenType = null;
       var style = state.tokenize(stream, state);
 
-      if (tokenType != "space") {
+      if (tokenType !== "space") {
         if (state.lastToken === "(" && state.ctx.indentTo === null) {
           if (tokenType === "symbol" &&
               (indentSymbol.propertyIsEnumerable(stream.current()) ||
@@ -251,7 +250,7 @@ CodeMirror.defineMode("clojure", function (options) {
       return style;
     },
 
-    indent: function (state, _textAfter) {
+    indent: function (state) {
       var i = state.ctx.indentTo;
 
       return (typeof i === "number") ?

mode/clojure/test.js

@@ -80,20 +80,20 @@
         // "[bracket (][comment comment] [comment (][comment foo] [comment 1] [comment 2] [comment 3][comment )][bracket )]"
     );
 
-    MT("quotes",
-        "[atom '][number 1]",
-        "[atom ':foo]",
-        "[atom '][string \"foo\"]",
-        "[atom '][variable x]",
-        "[atom '][bracket (][builtin a] [variable b] [variable c][bracket )]",
-        "[atom '][bracket [[][variable a] [variable b] [variable c][bracket ]]]",
-        "[atom '][bracket {][variable a] [number 1] [atom :foo] [number 2] [variable c] [number 3][bracket }]",
-        "[atom '][meta #][bracket {][variable a] [number 1] [atom :foo][bracket }]"
-    );
-
-    MT("# and ^",
-        "[meta #]",
-        "[meta ^]"
+    MT("reader macro characters",
+        "[meta #][variable _]",
+        "[meta @][variable x]",
+        "[meta ^][bracket {][atom :tag] [variable String][bracket }]",
+        "[meta `][bracket (][builtin f] [variable x][bracket )]",
+        "[meta ~][variable foo#]",
+        "[meta '][number 1]",
+        "[meta '][atom :foo]",
+        "[meta '][string \"foo\"]",
+        "[meta '][variable x]",
+        "[meta '][bracket (][builtin a] [variable b] [variable c][bracket )]",
+        "[meta '][bracket [[][variable a] [variable b] [variable c][bracket ]]]",
+        "[meta '][bracket {][variable a] [number 1] [atom :foo] [number 2] [variable c] [number 3][bracket }]",
+        "[meta '#][bracket {][variable a] [number 1] [atom :foo][bracket }]"
     );
 
     var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
@@ -347,7 +347,7 @@
         "[bracket (][keyword defmacro] [variable foo]",
         "  [string \"here is an indented doc-string.\"]",
         "  [bracket [[][variable x] [variable y][bracket ]]]",
-        "  [atom `][bracket (][keyword println] [atom ~][variable x] [atom ~@][variable y][bracket ))]"
+        "  [meta `][bracket (][keyword println] [meta ~][variable x#] [meta ~@][variable y][bracket ))]"
     );
 
     MT("should indent defmethod",