Skip to content

ivy.el (ivy--update-minibuffer): allow to resumed using stale data f… #2762

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ivy.el (ivy--update-minibuffer): allow to resumed using stale data f… #2762

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2e16f8
ivy.el (ivy--update-minibuffer): allow to resumed using stale data fr…
kiennq Dec 16, 2020
e163055
Merge branch 'master' into feat/resume-stale
kiennq Aug 3, 2022
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
16 changes: 13 additions & 3 deletions ivy.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,10 @@ If the text hasn't changed as a result, forward to `ivy-alt-done'."
(setq ivy-exit 'done)
(exit-minibuffer))

(defcustom ivy-resume-with-stale-data nil
"Allow to use stale results when resuming from dynamic collection."
:type 'boolean)

(defun ivy--restore-session (&optional session)
"Resume a recorded completion SESSION, if any exists."
(when ivy--sessions
Expand All @@ -1221,7 +1225,8 @@ With a prefix arg, try to restore a recorded completion session,
if one exists."
(interactive)
(when (or current-prefix-arg session)
(ivy--restore-session session))
(ivy--restore-session session)
(setq this-command 'ivy-resume))

(if (or (null (ivy-state-action ivy-last))
(eq (ivy--get-action ivy-last) #'identity))
Expand Down Expand Up @@ -2367,7 +2372,9 @@ This is useful for recursive `ivy-read'."
""
(ivy-state-collection ivy-last)
(ivy-state-predicate ivy-last))))
(setq coll (if (and (eq this-command 'ivy-resume) (not (buffer-modified-p)))
(setq coll (if (and (eq this-command 'ivy-resume)
(not (and (eq caller 'swiper-isearch)
(buffer-modified-p))))
ivy--all-candidates
(ivy--dynamic-collection-cands (or initial-input "")))))
((consp (car-safe collection))
Expand Down Expand Up @@ -3399,7 +3406,10 @@ Should be run via minibuffer `post-command-hook'."
(unless (or (equal ivy--old-text ivy-text)
(eq this-command 'ivy-resume))
(while-no-input
(setq coll (ivy--dynamic-collection-cands ivy-text))
(setq coll (if (and ivy-resume-with-stale-data
ivy--trying-to-resume-dynamic-collection)
ivy--all-candidates
(ivy--dynamic-collection-cands ivy-text)))
(when (eq coll 0)
(setq coll nil)
(setq ivy--old-re nil)
Expand Down