Skip to content

Add default keybindings for rename-ns-alias and add-arity refactorings, and refactor clojure-unwind #538

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 4 commits into from
Jul 16, 2019
Merged

Add default keybindings for rename-ns-alias and add-arity refactorings, and refactor clojure-unwind #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d27c3f
Refactor clojure-unwind to take prefix arguments.
yuhan0 Jul 13, 2019
f2cda8c
Add default keybindings for rename-ns-alias and add-arity refactorings
yuhan0 Jul 12, 2019
645ab5f
Tweak docstrings and indentation
yuhan0 Jul 12, 2019
f0252da
Update changelog and tests for clojure-unwind changes
yuhan0 Jul 16, 2019
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
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
### New features

* [#496](https://github.com/clojure-emacs/clojure-mode/issues/496): Highlight `[[wikilinks]]` in comments.
* [#366](https://github.com/clojure-emacs/clj-refactor.el/issues/366): Add support for renaming ns aliases (`clojure-rename-ns-alias`).
* [#410](https://github.com/clojure-emacs/clojure-mode/issues/410): Add support for adding an arity to a function (`clojure-add-arity`).
* [#366](https://github.com/clojure-emacs/clj-refactor.el/issues/366): Add support for renaming ns aliases (`clojure-rename-ns-alias`, default binding `C-c C-r n r`).
* [#410](https://github.com/clojure-emacs/clojure-mode/issues/410): Add support for adding an arity to a function (`clojure-add-arity`, default binding `C-c C-r a`), .

### Bugs fixed

Expand All @@ -21,6 +21,7 @@
### Changes

* [#524](https://github.com/clojure-emacs/clojure-mode/issues/524): Add proper indentation rule for `delay` (same as for `future`).
* [#538](https://github.com/clojure-emacs/clojure-mode/pull/538): Refactor `clojure-unwind` to take numeric prefix argument for unwinding N steps, and universal argument for unwinding completely. The dedicated `C-c C-r a` binding for `clojure-unwind-all`is now removed and replaced with the universal arg convention `C-u C-c C-r u`.

## 5.10.0 (2019-01-05)

Expand Down
55 changes: 31 additions & 24 deletions clojure-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,6 @@ Out-of-the box `clojure-mode' understands lein, boot, gradle,
(define-key map (kbd "f") #'clojure-thread-first-all)
(define-key map (kbd "C-l") #'clojure-thread-last-all)
(define-key map (kbd "l") #'clojure-thread-last-all)
(define-key map (kbd "C-a") #'clojure-unwind-all)
(define-key map (kbd "a") #'clojure-unwind-all)
(define-key map (kbd "C-p") #'clojure-cycle-privacy)
(define-key map (kbd "p") #'clojure-cycle-privacy)
(define-key map (kbd "C-(") #'clojure-convert-collection-to-list)
Expand All @@ -241,10 +239,13 @@ Out-of-the box `clojure-mode' understands lein, boot, gradle,
(define-key map (kbd "n h") #'clojure-insert-ns-form-at-point)
(define-key map (kbd "n u") #'clojure-update-ns)
(define-key map (kbd "n s") #'clojure-sort-ns)
(define-key map (kbd "n r") #'clojure-rename-ns-alias)
(define-key map (kbd "s i") #'clojure-introduce-let)
(define-key map (kbd "s m") #'clojure-move-to-let)
(define-key map (kbd "s f") #'clojure-let-forward-slurp-sexp)
(define-key map (kbd "s b") #'clojure-let-backward-slurp-sexp)
(define-key map (kbd "C-a") #'clojure-add-arity)
(define-key map (kbd "a") #'clojure-add-arity)
map)
"Keymap for Clojure refactoring commands.")
(fset 'clojure-refactor-map clojure-refactor-map)
Expand All @@ -263,11 +264,13 @@ Out-of-the box `clojure-mode' understands lein, boot, gradle,
["Cycle if, if-not" clojure-cycle-if]
["Cycle when, when-not" clojure-cycle-when]
["Cycle not" clojure-cycle-not]
["Add function arity" clojure-add-arity]
("ns forms"
["Insert ns form at the top" clojure-insert-ns-form]
["Insert ns form here" clojure-insert-ns-form-at-point]
["Update ns form" clojure-update-ns]
["Sort ns form" clojure-sort-ns])
["Sort ns form" clojure-sort-ns]
["Rename ns alias" clojure-rename-ns-alias])
("Convert collection"
["Convert to list" clojure-convert-collection-to-list]
["Convert to quoted list" clojure-convert-collection-to-quoted-list]
Expand Down Expand Up @@ -2196,10 +2199,12 @@ before fixing whitespace."
(delete-trailing-whitespace (car sexp) (cdr sexp)))))

;;;###autoload
(defun clojure-unwind ()
"Unwind thread at point or above point by one level.
Return nil if there are no more levels to unwind."
(interactive)
(defun clojure-unwind (&optional n)
"Unwind thread at point or above point by N levels.
With universal argument \\[universal-argument], fully unwind thread."
(interactive "P")
(setq n (cond ((equal n '(4)) 999)
(n) (1)))
(save-excursion
(let ((limit (save-excursion
(beginning-of-defun)
Expand All @@ -2208,23 +2213,24 @@ Return nil if there are no more levels to unwind."
(when (looking-at "(")
(forward-char 1)
(forward-sexp 1)))
(search-backward-regexp "([^-]*->" limit)
(if (clojure--nothing-more-to-unwind)
(progn (clojure--pop-out-of-threading)
(clojure--fix-sexp-whitespace)
nil)
(down-list)
(prog1 (cond
((looking-at "[^-]*->\\_>") (clojure--unwind-first))
((looking-at "[^-]*->>\\_>") (clojure--unwind-last)))
(clojure--fix-sexp-whitespace 'move-out))
t))))
(while (> n 0)
(search-backward-regexp "([^-]*->" limit)
(if (clojure--nothing-more-to-unwind)
(progn (clojure--pop-out-of-threading)
(clojure--fix-sexp-whitespace)
(setq n 0)) ;; break out of loop
(down-list)
(cond
((looking-at "[^-]*->\\_>") (clojure--unwind-first))
((looking-at "[^-]*->>\\_>") (clojure--unwind-last)))
(clojure--fix-sexp-whitespace 'move-out)
(setq n (1- n)))))))

;;;###autoload
(defun clojure-unwind-all ()
"Fully unwind thread at point or above point."
(interactive)
(while (clojure-unwind)))
(clojure-unwind '(4)))

(defun clojure--remove-superfluous-parens ()
"Remove extra parens from a form."
Expand Down Expand Up @@ -2676,7 +2682,7 @@ lists up."
;;;###autoload
(defun clojure-let-backward-slurp-sexp (&optional n)
"Slurp the s-expression before the let form into the let form.
With a numberic prefix argument slurp the previous N s-expression
With a numeric prefix argument slurp the previous N s-expressions
into the let form."
(interactive "p")
(let ((n (or n 1)))
Expand All @@ -2696,7 +2702,8 @@ into the let form."
;;;###autoload
(defun clojure-let-forward-slurp-sexp (&optional n)
"Slurp the next s-expression after the let form into the let form.
With a numeric prefix argument slurp the next N s-expressions into the let form."
With a numeric prefix argument slurp the next N s-expressions
into the let form."
(interactive "p")
(unless n (setq n 1))
(dotimes (_ n)
Expand Down Expand Up @@ -2725,8 +2732,8 @@ With a numeric prefix argument the let is introduced N lists up."
(let ((rgx (concat ":as +" current-alias))
(bound (save-excursion (forward-list 1) (point))))
(if (save-excursion (search-forward-regexp rgx bound t))
(let ((new-alias (read-from-minibuffer "New alias: ")))
(clojure--rename-ns-alias-internal current-alias new-alias))
(let ((new-alias (read-from-minibuffer "New alias: ")))
(clojure--rename-ns-alias-internal current-alias new-alias))
(message "Cannot find namespace alias: '%s'" current-alias))))))

;;;###autoload
Expand All @@ -2749,7 +2756,7 @@ With a numeric prefix argument the let is introduced N lists up."
((looking-back "\\[" 1) ;; single-arity defn
(let* ((bol (save-excursion (beginning-of-line) (point)))
(same-line (save-excursion (re-search-backward "defn" bol t)))
(new-arity-text (concat (when same-line "\n") "([])\n[")))
(new-arity-text (concat (when same-line "\n") "([])\n[")))
(re-search-backward " +\\[")
(replace-match new-arity-text)
(save-excursion
Expand Down
20 changes: 20 additions & 0 deletions test/clojure-mode-refactor-threading-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,26 @@
(clojure-unwind)
(clojure-unwind))

(when-refactoring-it "should unwind N steps with numeric prefix arg"
"(->> [1 2 3 4 5]
(filter even?)
(map square)
sum)"

"(->> (sum (map square (filter even? [1 2 3 4 5]))))"

(clojure-unwind 3))

(when-refactoring-it "should unwind completely with universal prefix arg"
"(->> [1 2 3 4 5]
(filter even?)
(map square)
sum)"

"(sum (map square (filter even? [1 2 3 4 5])))"

(clojure-unwind '(4)))

(when-refactoring-it "should unwind with function name"
"(->> [1 2 3 4 5]
sum
Expand Down