diff options
| author | João Távora <joaotavora@gmail.com> | 2021-08-15 13:19:59 +0100 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2021-08-15 13:32:59 +0100 |
| commit | ab23fa4eb22f6557414724769958a63f1c59b49a (patch) | |
| tree | a14032e6376cd7559a1d2b07c867dc3a1a3b76d6 /lisp/minibuffer.el | |
| parent | 926eeb7dd4b35a311d51cb651cc0c64fa4a5ab2c (diff) | |
| download | emacs-ab23fa4eb22f6557414724769958a63f1c59b49a.tar.gz emacs-ab23fa4eb22f6557414724769958a63f1c59b49a.tar.bz2 emacs-ab23fa4eb22f6557414724769958a63f1c59b49a.zip | |
Sort by recency in flex completion style when no flexy stuff happening
Fixes: bug#49888
* minibuffer.el (completion--flex-adjust-metadata): Fall back to usual
alphanumeric, length, recency strategy if no minibuffer input. There
is still a bug indicated by the nearby FIXMEs, though.
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 1e8e9fc6246..f335a9e13b4 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -3947,27 +3947,39 @@ that is non-nil." ((compose-flex-sort-fn (existing-sort-fn) ; wish `cl-flet' had proper indentation... (lambda (completions) - (let ((pre-sorted - (if existing-sort-fn - (funcall existing-sort-fn completions) - completions))) - (cond - ((or (not (window-minibuffer-p)) - ;; JT@2019-12-23: FIXME: this is still wrong. What - ;; we need to test here is "some input that actually - ;; leads to flex filtering", not "something after - ;; the minibuffer prompt". Among other - ;; inconsistencies, the latter is always true for - ;; file searches, meaning the next clauses will be - ;; ignored. - (> (point-max) (minibuffer-prompt-end))) - (sort - pre-sorted - (lambda (c1 c2) - (let ((s1 (get-text-property 0 'completion-score c1)) - (s2 (get-text-property 0 'completion-score c2))) - (> (or s1 0) (or s2 0)))))) - (t pre-sorted)))))) + (cond + (;; Sort by flex score whenever outside the minibuffer or + ;; in the minibuffer with some input. JT@2019-12-23: + ;; FIXME: this is still wrong. What we need to test here + ;; is "some input that actually leads to flex filtering", + ;; not "something after the minibuffer prompt". Among + ;; other inconsistencies, the latter is always true for + ;; file searches, meaning the next clauses in this cond + ;; will be ignored. + (or (not (window-minibuffer-p)) + (> (point-max) (minibuffer-prompt-end))) + (sort + (if existing-sort-fn + (funcall existing-sort-fn completions) + completions) + (lambda (c1 c2) + (let ((s1 (get-text-property 0 'completion-score c1)) + (s2 (get-text-property 0 'completion-score c2))) + (> (or s1 0) (or s2 0)))))) + (;; If no existing sort fn and nothing flexy happening, use + ;; the customary sorting strategy. + ;; + ;; JT@2021-08-15: FIXME: ideally this wouldn't repeat + ;; logic in `completion-all-sorted-completions', but that + ;; logic has other context that is either expensive to + ;; compute or not easy to access here. + (not existing-sort-fn) + (let ((lalpha (minibuffer--sort-by-length-alpha completions)) + (hist (and (minibufferp) + (and (not (eq minibuffer-history-variable t)) + (symbol-value minibuffer-history-variable))))) + (if hist (minibuffer--sort-by-position hist lalpha) lalpha))) + (t (funcall existing-sort-fn completions)))))) `(metadata (display-sort-function . ,(compose-flex-sort-fn |