[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ivy-hydra 9e1513f 195/395: ivy.el (ivy--split): Don't s
From: |
Basil L. Contovounesios |
Subject: |
[elpa] externals/ivy-hydra 9e1513f 195/395: ivy.el (ivy--split): Don't split consecutive group brackets |
Date: |
Thu, 25 Feb 2021 08:32:01 -0500 (EST) |
branch: externals/ivy-hydra
commit 9e1513fda3d2340c1306f94198dc46f33dfc4da9
Author: Oleh Krehel <ohwoeowho@gmail.com>
Commit: Oleh Krehel <ohwoeowho@gmail.com>
ivy.el (ivy--split): Don't split consecutive group brackets
* ivy-test.el (ivy--split): Add tests.
Fixes #2507
---
ivy-test.el | 6 +++++-
ivy.el | 5 +----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ivy-test.el b/ivy-test.el
index ef89e61..e1b2174 100644
--- a/ivy-test.el
+++ b/ivy-test.el
@@ -264,7 +264,11 @@ will bring the behavior in line with the newer Emacsen."
"\\( -> \\)"
".*")))
(should (equal (ivy--split "[^ ]\\( -> \\).*")
- '("[^ ]" "\\( -> \\)" ".*"))))
+ '("[^ ]" "\\( -> \\)" ".*")))
+ (should (equal (ivy--split "[ab][cd]") '("[ab][cd]")))
+ (should (equal (ivy--split "[a b][c d]") '("[a b][c d]")))
+ (should (equal (ivy--split "[ab] [cd]") '("[ab]" "[cd]")))
+ (should (equal (ivy--split "[a b] [c d]") '("[a b]" "[c d]"))))
(ert-deftest ivy--regex ()
(should (equal (ivy--regex
diff --git a/ivy.el b/ivy.el
index 2a88f45..3092d5b 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2811,10 +2811,7 @@ regexp is passed to `regexp-quote'."
(cond ((= ?\[ c)
(if (setq end (ivy--match-regex-brackets
(substring str i)))
- (progn
- (push (substring str start (+ i end)) res)
- (cl-incf i end)
- (setq start i))
+ (cl-incf i end)
(setq ivy--input-garbage (substring str i))
(throw 'break nil)))
((= ?\\ c)
- [elpa] externals/ivy-hydra 35d015b 166/395: ivy.el (ivy-avy): Configure no-counsel-M-x, (continued)
- [elpa] externals/ivy-hydra 35d015b 166/395: ivy.el (ivy-avy): Configure no-counsel-M-x, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 18d7ff9 168/395: ivy.el (ivy--set-candidates): Delete duplicates, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra b9eb3c1 162/395: swiper.el (swiper--line-number): Works with ivy-mark, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra ba73e45 156/395: ivy.el (ivy-read-action): Avoid ivy-read-action-ivy overwriting ivy--directory, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 328da1f 170/395: counsel.el (counsel-rg): Split command args in a more familiar way, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 1c1573e 167/395: ivy.el (ivy--update-prompt): Handle auto-insert.el, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 45a3609 176/395: counsel.el (counsel-rg-base-command): Add "-M 120" by default, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 0258725 175/395: counsel.el: Fix candidate splitting when eol is CR or CRLF, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 8fae568 184/395: counsel.el (counsel-org-link): Add, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 9b36d9c 186/395: swiper.el (swiper-isearch): Use ivy-init-fns-alist, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 9e1513f 195/395: ivy.el (ivy--split): Don't split consecutive group brackets,
Basil L. Contovounesios <=
- [elpa] externals/ivy-hydra 7b9b3cc 200/395: ivy.el (ivy--switch-buffer-matcher): Complete remote dirs via ":", Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 829cf8a 212/395: ivy.el (ivy--done): Set ivy-text, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 95896df 221/395: Honour sentence-end-double-space in recent change, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra c0a960b 216/395: ivy.el (ivy-read): Don't error on "Selecting deleted buffer", Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 8277a70 197/395: ivy.el (ivy-switch-buffer-transformer): Simplify, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra df41a6d 220/395: counsel.el (counsel-rg-base-command): Double the default max columns, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 51430ff 233/395: counsel.el: Fix candidate splitting when eol is CR or CRLF, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 04ca164 275/395: ivy-resume: resume buffer for counsel-grep, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 7dd6bfc 287/395: ivy.el (ivy-read): Document :extra-props as a plist, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 3e281d0 315/395: ivy-test.el (counsel-find-file-single-match-directories): Add test, Basil L. Contovounesios, 2021/02/25