ivy-test.el (swiper-isearch-backward): Goto old match on DEL

* ivy-test.el (swiper-isearch-backward-backspace): Add test.

Fixes #2125

ivy-test.el

@@ -1149,6 +1149,22 @@ a buffer visiting a file."
      ("C-r" "defun\\|defvar" "C-n RET"))
     "(defun foo)\nasdf\n(|defvar bar)")))
 
+(ert-deftest swiper-isearch-backward-backspace ()
+  (should
+   (string=
+    (ivy-with-text
+     "(while (when |))"
+     (global-set-key (kbd "C-r") #'swiper-isearch-backward)
+     ("C-r" "whi" "" "RET"))
+    "(while (|when ))"))
+  (should
+   (string=
+    (ivy-with-text
+     "(while (when |))"
+     (global-set-key (kbd "C-r") #'isearch-backward-regexp)
+     ("C-r" "whi" "" "RET"))
+    "(while (|when ))")))
+
 (ert-deftest swiper-isearch-case-fold ()
   (should
    (string=

swiper.el

@@ -1323,12 +1323,10 @@ come back to the same place as when \"a\" was initially entered.")
           (while (funcall (if swiper--isearch-backward #'re-search-backward #'re-search-forward) re nil t)
             (when (swiper-match-usable-p)
               (unless idx-found
-                (when (if swiper--isearch-backward
-                          ;; test if match is before point
-                          (<= (match-beginning 0) (cdar swiper--isearch-point-history))
-                        (or
-                         ;; test if match is at or after point
-                         (eq (match-beginning 0) pt-hist)
+                (when (or
+                       (eq (match-beginning 0) pt-hist)
+                       (if swiper--isearch-backward
+                           (<= (match-beginning 0) (cdar swiper--isearch-point-history))
                          (>= (match-beginning 0) (cdar swiper--isearch-point-history))))
                   (push (cons str (match-beginning 0)) swiper--isearch-point-history)
                   (setq idx-found idx)))