cljfmt: support standalone cli

totakke · Feb 24, 2025 · 93834f6 · 93834f6
1 parent b56de96
commit 93834f6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/example/config.edn b/example/config.edn
@@ -11,7 +11,7 @@
  :cljfmt
  {:disabled? false
   :version "0.13.0" ; default "RELEASE"
-  :clojure {:command-options ["--indents" "/path/to/indentation.edn"]}}
+  :command-options ["--indents" "/path/to/indentation.edn"]}
 
  :cljstyle
  {:disabled? false}

diff --git a/src/bosslint/linter/cljfmt.clj b/src/bosslint/linter/cljfmt.clj
@@ -5,14 +5,25 @@
 
 (def ^:private cljfmt-artifact "dev.weavejester/cljfmt")
 
+(defn- cljfmt-cli
+  [files conf]
+  (let [args (concat ["cljfmt" "check"]
+                     (:command-options conf)
+                     (map :absolute-path files))]
+    (case (apply process/run args)
+      0 :success
+      1 :warning
+      :error)))
+
 (defn- cljfmt-clojure
   [files conf]
   (let [version (or (:version conf) "RELEASE")
         args (concat ["clojure"
                       "-Sdeps" (format "{:deps {%s {:mvn/version \"%s\"}}}"
                                        cljfmt-artifact version)
                       "-M" "-m" "cljfmt.main" "check"]
-                     (:command-options (:clojure conf))
+                     (or (:command-options conf)
+                         (:command-options (:clojure conf)))
                      (map :absolute-path files))]
     (case (apply process/run args)
       0 :success
@@ -40,6 +51,9 @@
 
   (lint [files conf]
     (if-let [f (cond
+                 (process/command-exists? "cljfmt")
+                 cljfmt-cli
+
                  (and (linter/leiningen-project?)
                       (process/command-exists? "lein"))
                  cljfmt-lein