[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e69ddc3 295/399: ivy.el (ivy-sort-function-buffer): Unify
From: |
Oleh Krehel |
Subject: |
[elpa] master e69ddc3 295/399: ivy.el (ivy-sort-function-buffer): Unify prefix and star-prefix matches |
Date: |
Sat, 20 Jul 2019 14:57:43 -0400 (EDT) |
branch: master
commit e69ddc352f667aca8a1367dcbd3124d6fe3dd807
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy-sort-function-buffer): Unify prefix and star-prefix matches
Results in a more consistent sorting behavior.
---
ivy.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ivy.el b/ivy.el
index bf7ff08..2825a9d 100644
--- a/ivy.el
+++ b/ivy.el
@@ -3261,20 +3261,22 @@ before substring matches."
(= (aref name 0) ?^))
candidates
(let* ((base-re (ivy-re-to-str (funcall ivy--regex-function name)))
- (re-prefix (concat "\\`\\*" base-re))
+ (re-star-prefix (concat "\\`\\*" base-re))
+ (re-prefix (concat "\\`" base-re))
res-prefix
res-noprefix
res-virtual-prefix
res-virtual-noprefix)
- (unless (cl-find-if (lambda (s) (string-match-p re-prefix s)) candidates)
- (setq re-prefix (concat "\\`" base-re)))
(dolist (s candidates)
(cond
- ((and (assoc s ivy--virtual-buffers) (string-match-p re-prefix s))
+ ((and (assoc s ivy--virtual-buffers)
+ (or (string-match-p re-star-prefix s)
+ (string-match-p re-prefix s)))
(push s res-virtual-prefix))
((assoc s ivy--virtual-buffers)
(push s res-virtual-noprefix))
- ((string-match-p re-prefix s)
+ ((or (string-match-p re-star-prefix s)
+ (string-match-p re-prefix s))
(push s res-prefix))
(t
(push s res-noprefix))))
- [elpa] master bc2dcbe 279/399: counsel.el (counsel--find-build-subdir): Simplify, (continued)
- [elpa] master bc2dcbe 279/399: counsel.el (counsel--find-build-subdir): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 13da38a 287/399: ivy.el (ivy-help): Hide Org markup buffer-locally, Oleh Krehel, 2019/07/20
- [elpa] master 0134255 281/399: ivy.el (ivy--highlight-default): Use single face for adjacent groups, Oleh Krehel, 2019/07/20
- [elpa] master b7e9dfd 277/399: counsel.el: Fix a couple of typos, Oleh Krehel, 2019/07/20
- [elpa] master 92d5335 291/399: Add counsel-up-level command, Oleh Krehel, 2019/07/20
- [elpa] master 7e8622f 286/399: ivy.el (ivy-read-action): Fix, Oleh Krehel, 2019/07/20
- [elpa] master 0a26144 280/399: ivy.el (ivy--highlight-default): Handle unmatched groups, Oleh Krehel, 2019/07/20
- [elpa] master 8905b8b 278/399: counsel.el: Pacify byte-compiler, Oleh Krehel, 2019/07/20
- [elpa] master af5b594 283/399: ivy.el (ivy--occur-insert-lines): Fix typo bug, Oleh Krehel, 2019/07/20
- [elpa] master 04f56ca 282/399: ivy.el (ivy--recompute-index): Use configured flx candidate limit, Oleh Krehel, 2019/07/20
- [elpa] master e69ddc3 295/399: ivy.el (ivy-sort-function-buffer): Unify prefix and star-prefix matches,
Oleh Krehel <=
- [elpa] master f40b08a 293/399: ivy-display-function: obsolete this varible in favor ivy-display-functions-alist, Oleh Krehel, 2019/07/20
- [elpa] master 332f990 285/399: ivy.el: Fix compiler warning, Oleh Krehel, 2019/07/20
- [elpa] master 779db1e 292/399: ivy.el (ivy--occur-insert-lines): Add copy-sequence, Oleh Krehel, 2019/07/20
- [elpa] master a73e24d 288/399: Do not insert initial input if nil, Oleh Krehel, 2019/07/20
- [elpa] master 0b26219 301/399: counsel.el (counsel--file-name-filter): Move ignore-re binding., Oleh Krehel, 2019/07/20
- [elpa] master ef6d3db 297/399: ivy-overlay.el (ivy-display-function-overlay): Bring back org-indent-mode logic, Oleh Krehel, 2019/07/20
- [elpa] master 7feb14f 289/399: ivy.el (ivy-format-functions-alist): New defcustom, obsoletes ivy-format-function, Oleh Krehel, 2019/07/20
- [elpa] master b528f0f 299/399: ivy-overlay.el (ivy-display-function-overlay): Fix org-indent-mode once more, Oleh Krehel, 2019/07/20
- [elpa] master ef1e8d5 294/399: ivy.el (ivy-read): Don't use ivy-display-function, Oleh Krehel, 2019/07/20
- [elpa] master 57a57d1 302/399: swiper.el (swiper--multi-candidates): Simplify, Oleh Krehel, 2019/07/20