[clojure mode] Highlight forms wrapped by (comment ...) as comment.

This commit partially resolves issues #1896 and #2314 .

Author: Abdussalam Abdurrahman

mode/clojure/clojure.js

@@ -175,6 +175,8 @@ CodeMirror.defineMode("clojure", function (options) {
     var name = readSymbol(stream);
     tokenType = "symbol";
 
+    if (is(name, "comment") && is(state.lastToken, "("))
+      return (state.tokenize = inComment)(stream, state);
     if (is(name, atom) || is(name.charAt(0), ":")) return "atom";
     if (is(name, specialForm) || is(name, coreSymbol)) return "keyword";
     if (is(state.lastToken, "(")) return "builtin";  // other head symbol
@@ -193,6 +195,25 @@ CodeMirror.defineMode("clojure", function (options) {
     return "string";
   }
 
+  function inComment(stream, state) {
+    var parenthesisCount = 1;
+    var next;
+
+    while (next = stream.next()) {
+      if (is(next, ")")) parenthesisCount--;
+      if (is(next, "(")) parenthesisCount++;
+      if (is(parenthesisCount, 0)) {
+        stream.backUp(1);
+        state.tokenize = base;
+        break;
+      }
+    }
+
+    tokenType = "ws";
+
+    return "comment";
+  }
+
   function readSymbol(stream) {
     var ch;
 

mode/clojure/test.js

@@ -75,9 +75,9 @@
 
     MT("comments",
         "[comment ; this is an in-line comment.]",
-        "[comment ;; this is a line comment.]"
-        // FIXME
-        // "[bracket (][comment comment] [comment (][comment foo] [comment 1] [comment 2] [comment 3][comment )][bracket )]"
+        "[comment ;; this is a line comment.]",
+        "[keyword comment]",
+        "[bracket (][comment comment (foo 1 2 3)][bracket )]"
     );
 
     MT("reader macro characters",
@@ -309,8 +309,8 @@
     );
 
     MT("should indent comment",
-        "[bracket (][keyword comment] [bracket (][builtin foo][bracket )]",
-        "  [bracket (][builtin bar] [number 1] [number 2] [number 3][bracket ))]"
+        "[bracket (][comment comment (foo)]",
+        "[comment  (bar 1 2 3)][bracket )]"
     );
 
     MT("should indent cond",