Merge pull request #350 from camsaul/fix-349

Fix nested :inner specs
weavejester · Sep 23, 2024 · 9c0a19a · 9c0a19a
2 parents d750bc1 + 4346d0f
commit 9c0a19a
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/cljfmt/src/cljfmt/core.cljc b/cljfmt/src/cljfmt/core.cljc
@@ -367,11 +367,14 @@
 (defn- make-indenter [[key opts] context]
   (apply some-fn (map (partial indenter-fn key context) opts)))
 
-(defn- indent-order [[key _]]
-  (cond
-    (and (symbol? key) (namespace key)) (str 0 key)
-    (symbol? key) (str 1 key)
-    (pattern? key) (str 2 key)))
+(defn- indent-order [[key specs]]
+  (let [get-depth (fn [[type depth]] (if (= type :inner) depth 0))
+        max-depth (transduce (map get-depth) max 0 specs)
+        key-order  (cond
+                     (qualified-symbol? key) 0
+                     (simple-symbol? key)    1
+                     (pattern? key)          2)]
+    [(- max-depth) key-order (str key)]))
 
 (defn- custom-indent [zloc indents context]
   (if (empty? indents)

diff --git a/cljfmt/test/cljfmt/core_test.cljc b/cljfmt/test/cljfmt/core_test.cljc
@@ -173,7 +173,40 @@
          ["(defrecord Foo [x]"
           "  Closeable"
           "  (close [_]"
-          "    (prn x)))"])))
+          "    (prn x)))"]))
+    (testing "nested rules like [:inner 1] (#349)"
+      (is (reformats-to?
+           ["(ns my.namespace)"
+            ""
+            "(defprotocol MyProtocol"
+            "MyClass"
+            "(with-x [this x]"
+            "\"with-x is a method\"))"
+            ""
+            "(extend-protocol MyProtocol"
+            "MyClass"
+            "(with-x [this x]"
+            "(+ this x)))"
+            ""
+            "(defn x [x]"
+            "(with-x x "
+            "1))"]
+           ["(ns my.namespace)"
+            ""
+            "(defprotocol MyProtocol"
+            "  MyClass"
+            "  (with-x [this x]"
+            "    \"with-x is a method\"))"
+            ""
+            "(extend-protocol MyProtocol"
+            "  MyClass"
+            "  (with-x [this x]"
+            "    (+ this x)))"
+            ""
+            "(defn x [x]"
+            "  (with-x x"
+            "          1))"]
+           {:extra-indents '{my.namespace/with-x [[:block 0]]}}))))
 
   (testing "data structure indentation"
     (is (reformats-to?