Merge pull request cloverage#151 from cloverage/cljfmt

Fix cljfmt issues introduced by long-standing PRs

Author: lvh

cloverage/project.clj

@@ -14,10 +14,8 @@
             :comments "same as Clojure"}
   :deploy-repositories [["clojars" {:username :env/clojars_username :password :env/clojars_password :sign-releases false}]]
   :plugins [[lein-release "1.0.9"]]
-  :lein-release {
-    :scm :git ; Because we're not in the top-level directory, so it doesn't auto-detect
-    :deploy-via :clojars
-  }
+  :lein-release {:scm :git ; Because we're not in the top-level directory, so it doesn't auto-detect
+                 :deploy-via :clojars}
   :dependencies [[org.clojure/tools.reader "1.0.0-beta3"]
                  [org.clojure/tools.cli "0.3.5"]
                  [org.clojure/tools.logging "0.3.1"]
@@ -28,7 +26,7 @@
                  [cheshire "5.6.3"]]
   :profiles {:dev    {:aot          ^:replace []
                       :dependencies [[org.clojure/clojure "1.8.0"]]
-                      :plugins [[lein-cljfmt "0.5.6"]] }
+                      :plugins [[lein-cljfmt "0.5.6"]]}
              :1.4    {:dependencies [[org.clojure/clojure "1.4.0"]]}
              :1.5    {:dependencies [[org.clojure/clojure "1.5.1"]]}
              :1.6    {:dependencies [[org.clojure/clojure "1.6.0"]]}

cloverage/src/cloverage/rewrite.clj

@@ -30,25 +30,24 @@
   [f form]
   (walk (partial prewalk f) identity (f form)))
 
-
 (defn do-walk [pred f forms]
   (prewalk
-    (fn [x] (if (pred x) (f x) x))
-    forms))
+   (fn [x] (if (pred x) (f x) x))
+   forms))
 
 (defn cs? [s]
   (chunked-seq? s))
 
 (defn chunked-if? [form]
   (and
-    (seq? form)
-    (= (first form) 'if)
-    (seq? (second form))
-    (= (first (second form)) `chunked-seq?)))
+   (seq? form)
+   (= (first form) 'if)
+   (seq? (second form))
+   (= (first (second form)) `chunked-seq?)))
 
 (defn unchunk [forms]
   (->>
-    forms
-    (do-walk `#{chunked-seq?} (constantly `cs?))
-    macroexpand
-    (do-walk chunked-if? #(nth % 3))))
+   forms
+   (do-walk `#{chunked-seq?} (constantly `cs?))
+   macroexpand
+   (do-walk chunked-if? #(nth % 3))))

lein-cloverage/project.clj

@@ -11,10 +11,8 @@
             :distribution :repo
             :comments "same as Clojure"}
   :plugins [[lein-release "1.0.9"]]
-  :lein-release {
-    :scm :git ; Because we're not in the top-level directory, so it doesn't auto-detect
-    :deploy-via :clojars
-  }
+  :lein-release {:scm :git ; Because we're not in the top-level directory, so it doesn't auto-detect
+                 :deploy-via :clojars}
   :deploy-repositories [["clojars" {:username :env/clojars_username :password :env/clojars_password :sign-releases false}]]
   :min-lein-version "2.0.0"
   :dependencies [[bultitude "0.2.8"]]