From e2e16f8a5e34253342f444812624fcf02dd40201 Mon Sep 17 00:00:00 2001 From: Kien Nguyen Date: Wed, 16 Dec 2020 16:02:46 +0900 Subject: [PATCH] ivy.el (ivy--update-minibuffer): allow to resumed using stale data from dynamic collection --- ivy.el | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ivy.el b/ivy.el index 00f56a31..c6c66e4e 100644 --- a/ivy.el +++ b/ivy.el @@ -1178,6 +1178,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 @@ -1203,7 +1207,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)) @@ -2324,7 +2329,9 @@ This is useful for recursive `ivy-read'." counsel-switch-buffer))) predicate))) (dynamic-collection - (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)) @@ -3317,7 +3324,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)