From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 2 Jun 2020 20:06:21 +0000 (+0200)
Subject: patch 8.2.0887: searchcount().exact_match is 1 right after a match
X-Git-Tag: v8.2.0887
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57f75a5a364ad4d8334fdf6b6b41420b48e08390;p=vim

patch 8.2.0887: searchcount().exact_match is 1 right after a match

Problem:    Searchcount().exact_match is 1 right after a match.
Solution:   Use LT_POS() instead of LTOREQ_POS(). (closes #6189)
---

diff --git a/src/search.c b/src/search.c
index 0c253e971..210806258 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3252,7 +3252,7 @@ update_search_stat(
 	    if (LTOREQ_POS(lastpos, p))
 	    {
 		cur = cnt;
-		if (LTOREQ_POS(p, endpos))
+		if (LT_POS(p, endpos))
 		    exact_match = TRUE;
 	    }
 	    fast_breakcheck();
diff --git a/src/testdir/test_search_stat.vim b/src/testdir/test_search_stat.vim
index de73051d2..668545c5a 100644
--- a/src/testdir/test_search_stat.vim
+++ b/src/testdir/test_search_stat.vim
@@ -27,6 +27,14 @@ func Test_search_stat()
   call assert_equal(
     \ #{current: 1, exact_match: 1, total: 10, incomplete: 0, maxcount: 99},
     \ searchcount(#{pattern: 'fooooobar', pos: [3, 1, 0]}))
+  " on last char of match
+  call assert_equal(
+    \ #{current: 1, exact_match: 1, total: 10, incomplete: 0, maxcount: 99},
+    \ searchcount(#{pattern: 'fooooobar', pos: [3, 9, 0]}))
+  " on char after match
+  call assert_equal(
+    \ #{current: 1, exact_match: 0, total: 10, incomplete: 0, maxcount: 99},
+    \ searchcount(#{pattern: 'fooooobar', pos: [3, 10, 0]}))
   call assert_equal(
     \ #{current: 1, exact_match: 0, total: 10, incomplete: 0, maxcount: 99},
     \ searchcount(#{pattern: 'fooooobar', pos: [4, 1, 0]}))
diff --git a/src/version.c b/src/version.c
index 9a34111d6..91d4a467b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    887,
 /**/
     886,
 /**/