Skip to content

paredit: barf fns: support ops after update #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2025
Merged

paredit: barf fns: support ops after update #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 53 additions & 36 deletions src/rewrite_clj/paredit.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,48 +555,65 @@
(slurp-backward-fully-into zloc {:from :parent})))

(defn barf-forward
"Push out the rightmost node of the current S-expression into outer right form.
"Returns `zloc` with rightmost node of the parent sequence pushed right out of the sequence.

- `[1 2 [|3 4] 5] => [1 2 [|3] 4 5]`"
[zloc]
(let [barfee-loc (z/rightmost zloc)]
Comments and newlines preceding barfed node are also barfed.

(if-not (z/up zloc)
zloc
(let [preserves (->> (-> barfee-loc
z/left*
(nodes-by-dir z/left* ws/whitespace-or-comment?))
(filter #(or (nd/linebreak? %) (nd/comment? %)))
reverse)]
(-> barfee-loc
(u/remove-left-while ws/whitespace-or-comment?)
(u/remove-right-while ws/whitespace?)
u/remove-and-move-up
(z/insert-right (z/node barfee-loc))
((partial reduce z/insert-right) preserves)
(#(or (global-find-by-node % (z/node zloc))
(global-find-by-node % (z/node barfee-loc)))))))))
- `[1 2 [|3 4] 5] => [1 2 [|3] 4 5]`
- `[1 2 [|3] 4 5] => [1 2 [] |3 4 5]`"
[zloc]
(if-not (z/up zloc)
zloc
(let [barfee-loc (z/rightmost zloc)
also-barf (linebreak-and-comment-nodes barfee-loc z/left*)
adjust-location (fn [zloc-barf-seq]
(let [left-sibs (count (zraw/lefts zloc))
barf-loc (if (z/whitespace-or-comment? zloc)
(or (z/right zloc) (z/left zloc))
zloc)]
(if (= barfee-loc barf-loc)
(z/right zloc-barf-seq)
(-> zloc-barf-seq z/down (move-n z/right* left-sibs)))))
adjust-ws (fn [zloc-before-also-barf]
(if (and (seq also-barf)
(some-> zloc-before-also-barf z/right* z/whitespace?))
(u/remove-right zloc-before-also-barf)
zloc-before-also-barf))]
(-> barfee-loc
(u/remove-left-while ws/whitespace-or-comment?)
(u/remove-right-while ws/whitespace?)
u/remove-and-move-up
(z/insert-right (z/node barfee-loc))
adjust-ws
(reduce-into-zipper z/insert-right* also-barf)
adjust-location))))

(defn barf-backward
"Push out the leftmost node of the current S-expression into outer left form.
"Returns `zloc` with leftmost node of the parent sequence pushed left out of the sequence.

- `[1 2 [3 |4] 5] => [1 2 3 [|4] 5]`"
- `[1 2 [3 |4] 5] => [1 2 3 [|4] 5]`
- `[1 2 3 [|4] 5] => [1 2 3 |4 [] 5]`"
[zloc]
(let [barfee-loc (z/leftmost zloc)]
(if-not (z/up zloc)
zloc
(let [preserves (->> (-> barfee-loc
z/right*
(nodes-by-dir z/right* ws/whitespace-or-comment?))
(filter #(or (nd/linebreak? %) (nd/comment? %))))]
(-> barfee-loc
(u/remove-left-while ws/whitespace?)
(u/remove-right-while ws/whitespace-or-comment?) ;; probably insert space when on same line !
z/remove*
(z/insert-left (z/node barfee-loc))
((partial reduce z/insert-left) preserves)
(#(or (global-find-by-node % (z/node zloc))
(global-find-by-node % (z/node barfee-loc)))))))))
(if-not (z/up zloc)
zloc
(let [barfee-loc (z/leftmost zloc)
also-barf (linebreak-and-comment-nodes barfee-loc z/right*)
adjust-location (fn [zloc-barf-seq]
(let [right-sibs (count (zraw/rights zloc))
barf-loc (if (z/whitespace-or-comment? zloc)
(or (z/left zloc) (z/right zloc))
zloc)]

(if (= barfee-loc barf-loc)
(z/left zloc-barf-seq)
(-> zloc-barf-seq z/down* z/rightmost* (move-n z/left* right-sibs)))))]
(-> barfee-loc
(u/remove-left-while ws/whitespace?)
(u/remove-right-while ws/whitespace-or-comment?)
u/remove-and-move-up
(z/insert-left (z/node barfee-loc))
(reduce-into-zipper z/insert-left* also-barf)
adjust-location))))

(defn wrap-around
"Wrap current node with a given type `t` where `t` can be one of `:vector`, `:list`, `:set`, `:map` `:fn`.
Expand Down
66 changes: 45 additions & 21 deletions test/rewrite_clj/paredit_test.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,31 +291,55 @@
(deftest barf-forward-test
(doseq [opts zipper-opts]
(testing (zipper-opts-desc opts)
(doseq [[s expected]
[["[[⊚1 2 3] 4]" "[[⊚1 2] 3 4]"]
["[[1 ⊚2 3] 4]" "[[1 ⊚2] 3 4]"]
["[[1 2 ⊚3] 4]" "[[1 2] ⊚3 4]"]
["[[1 2 3⊚ ] 4]" "[[1 2] ⊚3 4]"]
["[[⊚1] 2]" "[[] ⊚1 2]"]
["(⊚(x) 1)" "(⊚(x)) 1"]
["(⊚(x)1)" "(⊚(x)) 1"]
["(⊚(x)(y))" "(⊚(x)) (y)"]
["[⊚{:a 1} {:b 2} {:c 3}]" "[⊚{:a 1} {:b 2}] {:c 3}"]
["[{:a 1} ⊚{:b 2} {:c 3}]" "[{:a 1} ⊚{:b 2}] {:c 3}"]
["[{:a 1} {:b 2} ⊚{:c 3}]" "[{:a 1} {:b 2}] ⊚{:c 3}"]]]
(let [zloc (th/of-locmarked-string s opts)]
(is (= s (th/root-locmarked-string zloc)) "string before")
(is (= expected (-> zloc pe/barf-forward th/root-locmarked-string)) "string after"))))))
(doseq [[s expected]
[["[[1 ⊚2 3] 4]" "[[1 ⊚2] 3 4]"]
["[[⊚1 2 3] 4]" "[[⊚1 2] 3 4]" ]
["[[1 2 ⊚3] 4]" "[[1 2] ⊚3 4]"]
["[[1 2 3⊚ ] 4]" "[[1 2] ⊚3 4]"]
["[[1 2⊚ 3] 4]" "[[1 2] ⊚3 4]"]
["[[⊚1] 2]" "[[] ⊚1 2]"]
["(⊚(x) 1)" "(⊚(x)) 1"]
["(⊚(x)1)" "(⊚(x)) 1"]
["(⊚(x)(y))" "(⊚(x)) (y)"]
["[⊚{:a 1} {:b 2} {:c 3}]" "[⊚{:a 1} {:b 2}] {:c 3}"]
["[{:a 1} ⊚{:b 2} {:c 3}]" "[{:a 1} ⊚{:b 2}] {:c 3}"]
["[{:a 1} {:b 2} ⊚{:c 3}]" "[{:a 1} {:b 2}] ⊚{:c 3}"]
["[⊚1 ;; comment\n2]" "[⊚1];; comment\n2"]
["[1 ⊚;; comment\n2]" "[1];; comment\n⊚2"]
["[1 ;; comment\n⊚2]" "[1];; comment\n⊚2"]
["[1 ;; comment\n⊚2]" "[1];; comment\n⊚2"]
["[1 ;; cmt1\n;; cmt2\n⊚2]" "[1];; cmt1\n;; cmt2\n⊚2"]
["[1 \n \n;; cmt1\n \n;; cmt2\n \n\n ⊚2]" "[1]\n\n;; cmt1\n\n;; cmt2\n\n\n⊚2"]]]
(testing s
(let [zloc (th/of-locmarked-string s opts)]
(is (= s (th/root-locmarked-string zloc)) "(sanity) string before")
(is (= expected (-> zloc pe/barf-forward th/root-locmarked-string)) "root string after")))))))

(deftest barf-backward-test
(doseq [opts zipper-opts]
(testing (zipper-opts-desc opts)
(doseq [[s expected]
[["[1 [2 3 ⊚4]]" "[1 2 [3 ⊚4]]"]
["[1 [⊚2 3 4]]" "[1 ⊚2 [3 4]]"]]]
(let [zloc (th/of-locmarked-string s opts)]
(is (= s (th/root-locmarked-string zloc)) "(sanity) string before")
(is (= expected (-> zloc pe/barf-backward th/root-locmarked-string)) "string after"))))))
(doseq [[s expected]
[["[1 [2 ⊚3 4]]" "[1 2 [⊚3 4]]"]
["[1 [2 3 ⊚4]]" "[1 2 [3 ⊚4]]"]
["[1 [⊚2 3 4]]" "[1 ⊚2 [3 4]]"]
["[1 [2⊚ 3 4]]" "[1 ⊚2 [3 4]]"]
["[1 [⊚ 2 3 4]]" "[1 ⊚2 [3 4]]"]
["[1 [⊚2]]" "[1 ⊚2 []]"]
["(1 ⊚(x))" "1 (⊚(x))"]
["(1⊚(x))" "1 (⊚(x))"]
["((x)⊚(y))" "(x) (⊚(y))"]
["[{:a 1} {:b 2} ⊚{:c 3}]" "{:a 1} [{:b 2} ⊚{:c 3}]"]
["[{:a 1} ⊚{:b 2} {:c 3}]" "{:a 1} [⊚{:b 2} {:c 3}]"]
["[⊚{:a 1} {:b 2} {:c 3}]" "⊚{:a 1} [{:b 2} {:c 3}]"]
["[1 ;; comment\n⊚2]" "1 ;; comment\n[⊚2]"]
["[1 ⊚;; comment\n2]" "⊚1 ;; comment\n[2]"]
["[⊚1 ;; comment\n2]" "⊚1 ;; comment\n[2]"]
["[⊚1 ;; cmt1\n;; cmt2\n2]" "⊚1 ;; cmt1\n;; cmt2\n[2]"]
["[⊚1 \n \n;; cmt1\n \n;; cmt2\n \n\n 2]" "⊚1 \n\n;; cmt1\n\n;; cmt2\n\n\n[2]"]]]
(testing s
(let [zloc (th/of-locmarked-string s opts)]
(is (= s (th/root-locmarked-string zloc)) "(sanity) string before")
(is (= expected (-> zloc pe/barf-backward th/root-locmarked-string)) "root string after")))))))

(deftest wrap-around-test
(doseq [opts zipper-opts]
Expand Down
Loading