Support / and // shorthand for repeated search motions (#1484)

Author: tomdl89

evil-search.el

@@ -957,7 +957,8 @@ any error conditions."
       (let* ((res (evil-ex-split-search-pattern pattern-string direction))
              (pat (pop res))
              (offset (pop res))
-             (next-pat (pop res)))
+             (next-pat (pop res))
+             (orig-pat pat))
         ;; use last pattern if no new pattern has been specified
         (if (not (zerop (length pat)))
             (setq pat (evil-ex-make-search-pattern pat))
@@ -982,15 +983,21 @@ any error conditions."
            ((zerop (length next-pat))
             (evil-ex-search-goto-offset offset)
             (throw 'done (list search-result pat offset)))
-           ;; next pattern but empty
+           ;; single `?' or `/' means repeat last pattern and finish
            ((= 1 (length next-pat))
             (evil-ex-search-goto-offset offset)
-            (throw 'done (list 'empty-pattern pat offset)))
+            (setq count 1
+                  pattern-string orig-pat
+                  direction (if (string= "/" next-pat) 'forward 'backward)))
            ;; next non-empty pattern, next search iteration
            (t
             (evil-ex-search-goto-offset offset)
             (setq count 1
-                  pattern-string (substring next-pat 1)
+                  pattern-string (if (and (<= 2 (length next-pat))
+                                          (member (substring next-pat 0 2) '("//" "??")))
+                                     ;; double `?' or `/' means repeat last pattern
+                                     (concat orig-pat (substring next-pat 1))
+                                   (substring next-pat 1))
                   direction (if (= (aref next-pat 0) ?/)
                                 'forward
                               'backward)))))))))

evil-tests.el

@@ -7518,7 +7518,16 @@ if no previous selection")
       (evil-test-buffer
         "[f]oo foo\nbar bar\nbaz baz\nAnother line\nAnd yet another line"
         ("/bar/e" [return] "//b+1" [return])
-        "foo foo\nbar b[a]r\nbaz baz\nAnother line\nAnd yet another line"))))
+        "foo foo\nbar b[a]r\nbaz baz\nAnother line\nAnd yet another line"))
+    (ert-info ("Test repeat of pattern in the same search")
+      (evil-test-buffer
+        "[a]lpha bravo charlie delta charlie alpha bravo alpha"
+        ("/charlie/;/")
+        "alpha bravo charlie delta [c]harlie alpha bravo alpha"
+        ("/alpha/;//")
+        "alpha bravo charlie delta charlie alpha bravo [a]lpha"
+        ("?charlie?;?")
+        "alpha bravo [c]harlie delta charlie alpha bravo alpha"))))
 
 (ert-deftest evil-test-ex-search-word ()
   "Test search for word under point."