diff --git a/.zprintrc b/.zprintrc index 139b61625a..059d1998a2 100644 --- a/.zprintrc +++ b/.zprintrc @@ -26,9 +26,6 @@ "deftest-sub" :arg1-body "wait-for" :arg1-body "with-deps-check" :arg1-body - "ns" [:arg1-body - {:list {:respect-nl? false} - :vector {:respect-nl? false}}] "->" [:noarg1-body {:list {:constant-pair? false :force-nl? false} :next-inner-restore [[:list :constant-pair?]]}] @@ -40,7 +37,6 @@ :remove {:fn-force-nl #{:noarg1-body}} :style-map {:no-comma {:map {:comma? false}} - :rj-var {:pair {:justify {:max-variance 1000}}} :custom-justify {:doc "Justify everything using pre-1.1.2 approach" :binding {:justify? true :justify {:max-variance 1000}} diff --git a/Makefile b/Makefile index cd10a4e9a7..cfc4de7541 100644 --- a/Makefile +++ b/Makefile @@ -294,10 +294,9 @@ lint: ##@test Run code style checks lint-fix: export TARGET := default lint-fix: ##@test Run code style checks and fix issues - TARGETS=$$(git diff --diff-filter=d --cached --name-only | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn$$ || echo shadow-cljs.edn) && \ - clojure-lsp clean-ns --filenames $$(echo $$TARGETS | xargs | sed -e 's/ /,/g') && \ - zprint '{:search-config? true}' -fw $$TARGETS && \ - zprint '{:search-config? true}' -fw $$TARGETS + ALL_CLOJURE_FILE=$$(git ls-files | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn$$) && \ + zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILE && \ + zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILE shadow-server: export TARGET := clojure diff --git a/nix/shell.nix b/nix/shell.nix index 6547d58a82..4d36cbe2e2 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -18,7 +18,7 @@ in mkShell { # build specific utilities clojure maven watchman # lint specific utilities - clj-kondo zprint clojure-lsp + clj-kondo zprint # other nice to have stuff yarn nodejs python27 ] # and some special cases