[clojure mode] Use whitelist for indenting forms with body parameter.

The current regular expression-based heuristics erroneously matches
symbols that don't necessary have body parameter (e.g., `default-for`).

Author: finalfantasia

mode/clojure/clojure.js

@@ -12,10 +12,10 @@
 "use strict";
 
 CodeMirror.defineMode("clojure", function (options) {
-  var commonAtoms = ["false", "nil", "true"];
-  var commonSpecialForms = [".", "catch", "def", "do", "if", "monitor-enter",
+  var atoms = ["false", "nil", "true"];
+  var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
       "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
-  var commonCoreSymbols = ["*", "*'", "*1", "*2", "*3", "*agent*",
+  var coreSymbols = ["*", "*'", "*1", "*2", "*3", "*agent*",
       "*allow-unresolved-vars*", "*assert*", "*clojure-version*",
       "*command-line-args*", "*compile-files*", "*compile-path*",
       "*compiler-options*", "*data-readers*", "*default-data-reader-fn*", "*e",
@@ -137,23 +137,22 @@ CodeMirror.defineMode("clojure", function (options) {
       "with-local-vars", "with-meta", "with-open", "with-out-str",
       "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
       "zipmap"];
-  var commonIndentSymbols = [
+  var formsThatHaveBodyParameter = [
       "assoc", "binding", "bound-fn", "case", "catch", "comment", "cond",
-      "condp", "def", "defmethod", "defn", "defprotocol", "defrecord",
-      "defstruct", "deftype", "do", "doseq", "dotimes", "doto", "extend",
-      "extend-protocol", "extend-type", "fn", "for", "future", "if", "if-let",
-      "if-not", "let", "letfn", "locking", "loop", "ns", "proxy", "reify",
-      "struct-map", "try", "when", "when-first", "when-let", "when-not",
-      "when-some", "while", "with-open", "with-precision"];
+      "condp", "def", "defmethod", "defn", "defmacro", "defprotocol",
+      "defrecord", "defstruct", "deftype", "do", "doseq", "dotimes", "doto",
+      "extend", "extend-protocol", "extend-type", "fn", "for", "future", "if",
+      "if-let", "if-not", "let", "letfn", "locking", "loop", "ns", "proxy",
+      "reify", "struct-map", "try", "when", "when-first", "when-let",
+      "when-not", "when-some", "while", "with-open", "with-precision"];
 
   CodeMirror.registerHelper("hintWords", "clojure",
-      commonAtoms.concat(commonSpecialForms, commonCoreSymbols));
+    [].concat(atoms, specialForms, coreSymbols));
 
-  var atom = createLookupMap(commonAtoms);
-  var specialForm = createLookupMap(commonSpecialForms);
-  var coreSymbol = createLookupMap(commonCoreSymbols);
-  var indentSymbol = createLookupMap(commonIndentSymbols);
-  var assumeBody = /^(?:def|with)[^\/]+$|\/(?:def|with)/;
+  var atom = createLookupMap(atoms);
+  var specialForm = createLookupMap(specialForms);
+  var coreSymbol = createLookupMap(coreSymbols);
+  var hasBodyParameter = createLookupMap(formsThatHaveBodyParameter);
   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]/;
 
@@ -253,8 +252,7 @@ CodeMirror.defineMode("clojure", function (options) {
 
       if (type !== "space") {
         if (state.lastToken === "(" && state.ctx.indentTo === null) {
-          if (type === "symbol" &&
-            (is(current, indentSymbol) || is(current, assumeBody)))
+          if (type === "symbol" && is(current, hasBodyParameter))
             state.ctx.indentTo = state.ctx.start + options.indentUnit;
           else state.ctx.indentTo = "next";
         } else if (state.ctx.indentTo === "next") {

mode/clojure/test.js

@@ -650,12 +650,6 @@
         "    [bracket (][keyword println] [variable b][bracket )))]"
     );
 
-    MT("should indent deftest and similar forms that assume body parameter",
-        "[bracket (][builtin clojure.test/deftest] [variable foo-test]",
-        "  [bracket (][builtin testing] [string \"that foo should work\"]",
-        "           [bracket (][builtin is] [bracket (][keyword =] [atom :baz] [bracket (][builtin foo] [atom :bar][bracket )))))]"
-    );
-
     function typeTokenPairs(type, tokens) {
         return "[" + type + " " + tokens.join("] [" + type + " ") + "]";
     }