search.c: remove dead code #5307

has_mbyte is always true.

2 files changed, 58 insertions, 36 deletions

diff --git a/src/nvim/search.c b/src/nvim/search.c
index 5566df74ef..b09931b337 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -360,17 +360,16 @@ int ignorecase_opt(char_u *pat, int ic_in, int scs)
   return ic;
 }
 
-/*
- * Return TRUE if pattern "pat" has an uppercase character.
- */
-int pat_has_uppercase(char_u *pat)
+/// Returns true if pattern `pat` has an uppercase character.
+bool pat_has_uppercase(char_u *pat)
+  FUNC_ATTR_NONNULL_ALL
 {
   char_u *p = pat;
 
   while (*p != NUL) {
-    int l;
+    const int l = mb_ptr2len(p);
 
-    if ((l = mb_ptr2len(p)) > 1) {
+    if (l > 1) {
       if (mb_isupper(utf_ptr2char(p))) {
         return true;
       }
@@ -391,7 +390,7 @@ int pat_has_uppercase(char_u *pat)
       p++;
     }
   }
-  return FALSE;
+  return false;
 }
 
 const char *last_csearch(void)
@@ -744,37 +743,29 @@ int searchit(
               } else
                 break;
 
-              /*
-               * We found a valid match, now check if there is
-               * another one after it.
-               * If vi-compatible searching, continue at the end
-               * of the match, otherwise continue one position
-               * forward.
-               */
+              // We found a valid match, now check if there is
+              // another one after it.
+              // If vi-compatible searching, continue at the end
+              // of the match, otherwise continue one position
+              // forward.
               if (vim_strchr(p_cpo, CPO_SEARCH) != NULL) {
-                if (nmatched > 1)
+                if (nmatched > 1) {
                   break;
+                }
                 matchcol = endpos.col;
-                /* for empty match: advance one char */
+                // for empty match: advance one char
                 if (matchcol == matchpos.col
                     && ptr[matchcol] != NUL) {
-                  if (has_mbyte)
-                    matchcol +=
-                      (*mb_ptr2len)(ptr + matchcol);
-                  else
-                    ++matchcol;
+                  matchcol += mb_ptr2len(ptr + matchcol);
                 }
               } else {
-                /* Stop when the match is in a next line. */
-                if (matchpos.lnum > 0)
+                // Stop when the match is in a next line.
+                if (matchpos.lnum > 0) {
                   break;
+                }
                 matchcol = matchpos.col;
                 if (ptr[matchcol] != NUL) {
-                  if (has_mbyte)
-                    matchcol +=
-                      (*mb_ptr2len)(ptr + matchcol);
-                  else
-                    ++matchcol;
+                  matchcol += mb_ptr2len(ptr + matchcol);
                 }
               }
               if (ptr[matchcol] == NUL
@@ -3636,16 +3627,14 @@ find_next_quote(
 
   for (;; ) {
     c = line[col];
-    if (c == NUL)
+    if (c == NUL) {
       return -1;
-    else if (escape != NULL && vim_strchr(escape, c))
-      ++col;
-    else if (c == quotechar)
+    } else if (escape != NULL && vim_strchr(escape, c)) {
+      col++;
+    } else if (c == quotechar) {
       break;
-    if (has_mbyte)
-      col += (*mb_ptr2len)(line + col);
-    else
-      ++col;
+    }
+    col += mb_ptr2len(line + col);
   }
   return col;
 }
diff --git a/test/unit/search_spec.lua b/test/unit/search_spec.lua
new file mode 100644
index 0000000000..3c2d485e0e
--- /dev/null
+++ b/test/unit/search_spec.lua
@@ -0,0 +1,33 @@
+local helpers = require("test.unit.helpers")(after_each)
+local itp = helpers.gen_itp(it)
+
+local to_cstr = helpers.to_cstr
+local eq      = helpers.eq
+
+local search = helpers.cimport("./src/nvim/search.h")
+
+itp('pat_has_uppercase', function()
+  -- works on empty string
+  eq(false, search.pat_has_uppercase(to_cstr("")))
+
+  -- works with utf uppercase
+  eq(false, search.pat_has_uppercase(to_cstr("ä")))
+  eq(true, search.pat_has_uppercase(to_cstr("Ä")))
+  eq(true, search.pat_has_uppercase(to_cstr("äaÅ")))
+
+  -- works when pat ends with backslash
+  eq(false, search.pat_has_uppercase(to_cstr("\\")))
+  eq(false, search.pat_has_uppercase(to_cstr("ab$\\")))
+
+  -- skips escaped characters
+  eq(false, search.pat_has_uppercase(to_cstr("\\Ab")))
+  eq(true, search.pat_has_uppercase(to_cstr("\\AU")))
+
+  -- skips _X escaped characters
+  eq(false, search.pat_has_uppercase(to_cstr("\\_Ab")))
+  eq(true, search.pat_has_uppercase(to_cstr("\\_AU")))
+
+  -- skips %X escaped characters
+  eq(false, search.pat_has_uppercase(to_cstr("aa\\%Ab")))
+  eq(true, search.pat_has_uppercase(to_cstr("aab\\%AU")))
+end)