Don't remove spacing before comments (fixes #242)

Author: weavejester

cljfmt/src/cljfmt/core.cljc

@@ -55,12 +55,17 @@
   (and (deref? zloc)
        (unquote? (z/up* zloc))))
 
+(defn- comment? [zloc]
+  (some-> zloc z/node n/comment?))
+
 (defn- surrounding-whitespace? [zloc]
   (and (not (top? zloc))
        (clojure-whitespace? zloc)
        (or (and (nil? (z/left* zloc))
                 ;; don't convert ~ @ to ~@
-                (not (unquote-deref? (z/right* zloc))))
+                (not (unquote-deref? (z/right* zloc)))
+                ;; ignore space before comments
+                (not (comment? (z/right* zloc))))
            (nil? (z/skip z/right* clojure-whitespace? zloc)))))
 
 (defn remove-surrounding-whitespace [form]
@@ -87,9 +92,6 @@
 (defn- space? [zloc]
   (= (z/tag zloc) :whitespace))
 
-(defn- comment? [zloc]
-  (some-> zloc z/node n/comment?))
-
 (defn- line-comment? [zloc]
   (and (comment? zloc) (re-matches #"(?s);;([^;].*)?" (z/string zloc))))
 

cljfmt/test/cljfmt/core_test.cljc

@@ -941,7 +941,15 @@
           "))"]
          ["(let [x 3"
           "      y 4]"
-          "  (+ (* x x) (* y y)))"]))))
+          "  (+ (* x x) (* y y)))"])))
+
+  (testing "spacing before comments left alone"
+    (is (reformats-to?
+         ["[  ; comment"
+          "1 2 3"
+          "]"]
+         ["[  ; comment"
+          " 1 2 3]"]))))
 
 (deftest test-missing-whitespace
   (testing "unglue inner"