From cf43a46c12850fde562ee97c6a3bb0c7da079f13 Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Sun, 19 Oct 2025 16:33:48 +0530
Subject: [PATCH] evil-search: show match count when using isearch

Use isearch-lazy-count-format to get the prefix and suffix formats.

Note that this has two requirements:
- isearch-lazy-count-format must be called after
  isearch-lazy-highlight-update so that the current count is updated.
- isearch-lazy-count-format must be called before going to beginning
  of the match using goto-char.
---
 evil-search.el | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/evil-search.el b/evil-search.el
index c882a8ea..50f482ce 100644
--- a/evil-search.el
+++ b/evil-search.el
@@ -123,8 +123,6 @@ to display in the echo area."
       (cancel-timer evil-flash-timer))
     (unless (or (null string)
                 (string= string ""))
-      (evil-echo-area-save)
-      (evil-echo "%s" string)
       (isearch-highlight (match-beginning 0) (match-end 0))
       (when all
         (setq isearch-lazy-highlight-wrapped nil
@@ -133,6 +131,12 @@ to display in the echo area."
         (isearch-lazy-highlight-new-loop)
         (unless isearch-lazy-highlight-overlays
           (isearch-lazy-highlight-update)))
+      ;; `isearch-lazy-count-current` is updated during
+      ;; `isearch-lazy-highlight-update`.
+      (let ((prefix (isearch-lazy-count-format nil))
+            (suffix (isearch-lazy-count-format t)))
+        (evil-echo-area-save)
+        (evil-echo "%s%s%s" prefix string suffix))
       (add-hook 'pre-command-hook #'evil-flash-hook nil t)
       (add-hook 'evil-operator-state-exit-hook #'evil-flash-hook nil t)
       (add-hook 'pre-command-hook #'evil-clean-isearch-overlays nil t)
@@ -259,8 +263,6 @@ one more than the current position."
          (goto-char orig)
          (user-error "\"%s\": %s not found"
                      string (if regexp-p "pattern" "string"))))
-      ;; always position point at the beginning of the match
-      (goto-char (match-beginning 0))
       ;; determine message for echo area
       (cond
        ((and forward (< (point) start))
@@ -271,7 +273,9 @@ one more than the current position."
         (setq string "Search wrapped around TOP of buffer"))
        (t
         (setq string (evil-search-message string forward))))
-      (evil-flash-search-pattern string t))))
+      (evil-flash-search-pattern string t)
+      ;; always position point at the beginning of the match
+      (goto-char (match-beginning 0)))))
 
 (defun evil-search-word (forward unbounded symbol)
   "Search for word near point.