Move entries within function literals as if in a list (clojure-lsp#792)

rewrite-clj has a special node for function literals #(,,,). For the purposes of moving entries, these nodes are the same as list nodes.
snoe · Mar 3, 2022 · 317fda3 · 317fda3
1 parent a3164f3
commit 317fda3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docs/images/features/move-coll-entry.gif b/docs/images/features/move-coll-entry.gif
diff --git a/lib/src/clojure_lsp/feature/move_coll_entry.clj b/lib/src/clojure_lsp/feature/move_coll_entry.clj
@@ -416,10 +416,10 @@
   (let [parent-zloc (z-up zloc)
         child-count (count-children parent-zloc)
         strat (case (some-> parent-zloc z/tag)
-                :map    {:breadth 2, :rind no-rind}
-                :set    {:breadth 1, :rind no-rind}
-                :vector (vector-strategy parent-zloc uri db)
-                :list   (list-strategy parent-zloc child-count)
+                :map        {:breadth 2, :rind no-rind}
+                :set        {:breadth 1, :rind no-rind}
+                :vector     (vector-strategy parent-zloc uri db)
+                (:list :fn) (list-strategy parent-zloc child-count)
                 nil)]
     (when strat
       (let [strat (assoc strat

diff --git a/lib/test/clojure_lsp/feature/move_coll_entry_test.clj b/lib/test/clojure_lsp/feature/move_coll_entry_test.clj
@@ -311,6 +311,8 @@
                     (h/code "(assoc x :a 2 |:b 1)"))
     (assert-move-up (h/code "(assoc x |:b 1 :a 2)")
                     (h/code "(assoc x :a 2 :b |1)"))
+    (assert-move-up (h/code "#(assoc % |:b 2 :a 1)")
+                    (h/code "#(assoc % :a 1 |:b 2)"))
     (assert-move-up (h/code "(-> {}"
                             "    (assoc |:b 1 :a 2))")
                     (h/code "(-> {}"