Improvements to some counsel-find-file actions #2053
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
basil-conto
reviewed
May 3, 2019
counsel.el
Outdated
| (make-directory (expand-file-name ivy-text ivy--directory)) | ||
| (unless (eq ivy-exit 'done) | ||
| (with-selected-window (active-minibuffer-window) | ||
| (ivy--cd (expand-file-name ivy-text ivy--directory))))) |
There was a problem hiding this comment.
I think it's safer to check that active-minibuffer-window does not return nil:
(defun counsel-find-file-mkdir-action (_x)
(let ((dir (expand-file-name ivy-text ivy--directory))
(win (and (not (eq ivy-exit 'done))
(active-minibuffer-window))))
(make-directory dir)
(when win (with-selected-window win (ivy--cd dir)))))Please also add a docstring. Thanks.
counsel.el
Outdated
| @@ -1754,7 +1754,9 @@ choose between `yes-or-no-p' and `y-or-n-p'; otherwise default to | |||
| (counsel--yes-or-no-p "Delete %s? " x)) | |||
| (dired-delete-file x dired-recursive-deletes delete-by-moving-to-trash) | |||
| (dired-clean-up-after-deletion x) | |||
| (ivy--reset-state ivy-last))) | |||
| (unless (eq ivy-exit 'done) | |||
| (with-selected-window (active-minibuffer-window) | |||
There was a problem hiding this comment.
Ditto re: active-minibuffer-window returning nil.
counsel.el
Outdated
| (counsel--find-file-1 "Copy file to: " | ||
| ivy--directory | ||
| (lambda (new-name) | ||
| (require 'dired-aux) |
There was a problem hiding this comment.
The require should be moved to the toplevel of the function, I think.
counsel.el
Outdated
| (counsel--find-file-1 "Rename file to: " | ||
| ivy--directory | ||
| (lambda (new-name) | ||
| (require 'dired-aux) |
There was a problem hiding this comment.
Ditto re: hoisting require out of the action function.
Make ivy-call cd into created directory.
Make ivy-call stay in directory and update minibuffer (previously it would go back to the initial directory from which counsel-find-file was called).
Start the new filename completion from the directory of the file to copy or move instead of the initial directory from which counsel-find-file was called. Also adapt the prompt to the action (was not the case for the copy action).
|
Thanks for the review, I applied your suggestions. |
abo-abo
added a commit
that referenced
this pull request
May 6, 2019
|
Thanks, all. |
astoff
pushed a commit
to astoff/swiper
that referenced
this pull request
Jan 1, 2021
Start the new filename completion from the directory of the file to copy or move instead of the initial directory from which counsel-find-file was called. Also adapt the prompt to the action (was not the case for the copy action). Fixes abo-abo#2053
astoff
pushed a commit
to astoff/swiper
that referenced
this pull request
Jan 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See commit messages.