Skip to content

Commit

Permalink
Sort cljfmt ns references
Browse files Browse the repository at this point in the history
  • Loading branch information
weavejester committed May 19, 2023
1 parent c80db73 commit aa40886
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion cljfmt.edn
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
:paths ["cljfmt/src"
"cljfmt/test"
"cljfmt/project.clj"
"lein-cljfmt/src"]}
"lein-cljfmt/src"]
:sort-ns-references? true}
6 changes: 3 additions & 3 deletions cljfmt/test/cljfmt/core_test.cljc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
(ns cljfmt.core-test
(:require [#?@(:clj (clojure.test :refer)
(:require #?(:clj [cljfmt.test-util.clojure])
[#?@(:clj (clojure.test :refer)
:cljs (cljs.test :refer-macros)) [deftest testing is]]
[cljfmt.core :refer [reformat-string default-line-separator
normalize-newlines find-line-separator
replace-newlines wrap-normalize-newlines]]
[cljfmt.test-util.common :as common]
#?(:clj [cljfmt.test-util.clojure]))
[cljfmt.test-util.common :as common])
#?(:cljs (:require-macros [cljfmt.test-util.cljs])))

(deftest test-indent
Expand Down
6 changes: 3 additions & 3 deletions cljfmt/test/cljfmt/test_runner.cljs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns cljfmt.test-runner
(:require [cljs.nodejs :as nodejs]
[cljs.test :refer-macros [run-tests]]
[cljfmt.core-test :as ct]))
(:require [cljfmt.core-test :as ct]
[cljs.nodejs :as nodejs]
[cljs.test :refer-macros [run-tests]]))

(nodejs/enable-util-print!)

Expand Down
4 changes: 2 additions & 2 deletions cljfmt/test/cljfmt/test_util/cljs.cljc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns cljfmt.test-util.cljs
(:require [cljs.test :as test]
[cljfmt.test-util.common :as common]))
(:require [cljfmt.test-util.common :as common]
[cljs.test :as test]))

#?(:clj
(defmethod test/assert-expr 'reformats-to? [_env msg form]
Expand Down
4 changes: 2 additions & 2 deletions cljfmt/test/cljfmt/test_util/clojure.clj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns cljfmt.test-util.clojure
(:require [clojure.test :as test]
[cljfmt.test-util.common :as common]))
(:require [cljfmt.test-util.common :as common]
[clojure.test :as test]))

(defmethod test/assert-expr 'reformats-to? [msg form]
`(test/do-report (common/assert-reformats-to ~msg ~@(rest form))))
4 changes: 2 additions & 2 deletions cljfmt/test/cljfmt/test_util/common.cljc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns cljfmt.test-util.common
(:require [clojure.string :as str]
[cljfmt.core :refer [reformat-string]]))
(:require [cljfmt.core :refer [reformat-string]]
[clojure.string :as str]))

(defn assert-reformats-to
([msg in-lines expected-lines]
Expand Down

0 comments on commit aa40886

Please sign in to comment.