aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--runtime/doc/options.txt4
-rw-r--r--runtime/doc/pattern.txt11
-rw-r--r--src/nvim/option.c2
-rw-r--r--src/nvim/option_defs.h1
-rw-r--r--src/nvim/options.lua2
-rw-r--r--src/nvim/search.c240
-rw-r--r--src/nvim/testdir/test_search_stat.vim108
7 files changed, 323 insertions, 45 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cce9f681f9..34779541d8 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5254,7 +5254,7 @@ A jump table for the options with a short description can be found at |Q_op|.
function to get the effective shiftwidth value.
*'shortmess'* *'shm'*
-'shortmess' 'shm' string (Vim default "filnxtToOF", Vi default: "")
+'shortmess' 'shm' string (Vim default "filnxtToOFS", Vi default: "S")
global
This option helps to avoid all the |hit-enter| prompts caused by file
messages, for example with CTRL-G, and to avoid some other messages.
@@ -5294,6 +5294,8 @@ A jump table for the options with a short description can be found at |Q_op|.
q use "recording" instead of "recording @a"
F don't give the file info when editing a file, like `:silent`
was used for the command
+ S do not show search count message when searching, e.g.
+ "[1/5]"
This gives you the opportunity to avoid that a change between buffers
requires you to hit <Enter>, but still gives as useful a message as
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 88b7f65209..022dc5607e 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -141,6 +141,17 @@ use <Esc> to abandon the search.
All matches for the last used search pattern will be highlighted if you set
the 'hlsearch' option. This can be suspended with the |:nohlsearch| command.
+When 'shortmess' does not include the "S" flag, Vim will automatically show an
+index, on which the cursor is. This can look like this: >
+
+ [1/5] Cursor is on first of 5 matches.
+ [1/>99] Cursor is on first of more than 99 matches.
+ [>99/>99] Cursor is after 99 match of more than 99 matches.
+ [?/??] Unknown how many matches exists, generating the
+ statistics was aborted because of search timeout.
+
+Note: the count does not take offset into account.
+
When no match is found you get the error: *E486* Pattern not found
Note that for the |:global| command this behaves like a normal message, for Vi
compatibility. For the |:s| command the "e" flag can be used to avoid the
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 43ee6bf451..fde1116cc9 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -315,7 +315,7 @@ static char_u SHM_ALL[] = {
SHM_RO, SHM_MOD, SHM_FILE, SHM_LAST, SHM_TEXT, SHM_LINES, SHM_NEW, SHM_WRI,
SHM_ABBREVIATIONS, SHM_WRITE, SHM_TRUNC, SHM_TRUNCALL, SHM_OVER,
SHM_OVERALL, SHM_SEARCH, SHM_ATTENTION, SHM_INTRO, SHM_COMPLETIONMENU,
- SHM_RECORDING, SHM_FILEINFO,
+ SHM_RECORDING, SHM_FILEINFO, SHM_SEARCHCOUNT,
0,
};
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 3e116095fd..a9f44976c9 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -173,6 +173,7 @@ enum {
SHM_COMPLETIONMENU = 'c', ///< Completion menu messages.
SHM_RECORDING = 'q', ///< Short recording message.
SHM_FILEINFO = 'F', ///< No file info messages.
+ SHM_SEARCHCOUNT = 'S', ///< Search sats: '[1/10]'
};
/// Represented by 'a' flag.
#define SHM_ALL_ABBREVIATIONS ((char_u[]) { \
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index affddd8084..3f28190ec3 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2134,7 +2134,7 @@ return {
type='string', list='flags', scope={'global'},
vim=true,
varname='p_shm',
- defaults={if_true={vi="", vim="filnxtToOF"}}
+ defaults={if_true={vi="S", vim="filnxtToOFS"}}
},
{
full_name='showbreak', abbreviation='sbr',
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 5661c41129..e1eb7200d7 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -14,6 +14,7 @@
#include "nvim/ascii.h"
#include "nvim/vim.h"
#include "nvim/search.h"
+#include "nvim/buffer.h"
#include "nvim/charset.h"
#include "nvim/cursor.h"
#include "nvim/edit.h"
@@ -997,6 +998,8 @@ int do_search(
char_u *dircp;
char_u *strcopy = NULL;
char_u *ps;
+ char_u *msgbuf = NULL;
+ size_t len;
/*
* A line offset is not remembered, this is vi compatible.
@@ -1123,61 +1126,95 @@ int do_search(
if ((options & SEARCH_ECHO) && messaging()
&& !cmd_silent && msg_silent == 0) {
- char_u *msgbuf;
char_u *trunc;
- if (*searchstr == NUL)
+ // Compute msg_row early.
+ msg_start();
+
+ if (*searchstr == NUL) {
p = spats[last_idx].pat;
- else
+ } else {
p = searchstr;
- msgbuf = xmalloc(STRLEN(p) + 40);
+ }
+
+ if (!shortmess(SHM_SEARCHCOUNT)) {
+ // Reserve enough space for the search pattern + offset +
+ // search stat.
+ if (msg_scrolled != 0) {
+ // Use all the columns.
+ len = (int)(Rows - msg_row) * Columns - 1;
+ } else {
+ // Use up to 'showcmd' column.
+ len = (int)(Rows - msg_row - 1) * Columns + sc_col - 1;
+ }
+ if (len < STRLEN(p) + 40 + 11) {
+ len = STRLEN(p) + 40 + 11;
+ }
+ } else {
+ // Reserve enough space for the search pattern + offset.
+ len = STRLEN(p) + 40;
+ }
+
+ msgbuf = xmalloc((int)len);
{
+ memset(msgbuf, ' ', len);
msgbuf[0] = dirc;
+ msgbuf[len - 1] = NUL;
+
if (utf_iscomposing(utf_ptr2char(p))) {
// Use a space to draw the composing char on.
msgbuf[1] = ' ';
- STRCPY(msgbuf + 2, p);
- } else
- STRCPY(msgbuf + 1, p);
+ STRNCPY(msgbuf + 2, p, STRLEN(p));
+ } else {
+ STRNCPY(msgbuf + 1, p, STRLEN(p));
+ }
if (spats[0].off.line || spats[0].off.end || spats[0].off.off) {
- p = msgbuf + STRLEN(msgbuf);
+ p = msgbuf + STRLEN(p) + 1;
*p++ = dirc;
- if (spats[0].off.end)
+ if (spats[0].off.end) {
*p++ = 'e';
- else if (!spats[0].off.line)
+ } else if (!spats[0].off.line) {
*p++ = 's';
- if (spats[0].off.off > 0 || spats[0].off.line)
+ }
+ if (spats[0].off.off > 0 || spats[0].off.line) {
*p++ = '+';
- if (spats[0].off.off != 0 || spats[0].off.line)
- sprintf((char *)p, "%" PRId64, (int64_t)spats[0].off.off);
- else
- *p = NUL;
+ }
+ if (spats[0].off.off != 0 || spats[0].off.line) {
+ int l = 0;
+ l = sprintf((char *)p, "%ld", spats[0].off.off);
+ p[l] = ' '; // remove NUL from sprintf
+ }
}
- msg_start();
trunc = msg_strtrunc(msgbuf, FALSE);
+ if (trunc != NULL) {
+ xfree(msgbuf);
+ msgbuf = trunc;
+ }
- /* The search pattern could be shown on the right in rightleft
- * mode, but the 'ruler' and 'showcmd' area use it too, thus
- * it would be blanked out again very soon. Show it on the
- * left, but do reverse the text. */
+ // The search pattern could be shown on the right in rightleft
+ // mode, but the 'ruler' and 'showcmd' area use it too, thus
+ // it would be blanked out again very soon. Show it on the
+ // left, but do reverse the text.
if (curwin->w_p_rl && *curwin->w_p_rlc == 's') {
char_u *r = reverse_text(trunc != NULL ? trunc : msgbuf);
- xfree(trunc);
- trunc = r;
+ xfree(msgbuf);
+ msgbuf = r;
+ // move reversed text to beginning of buffer
+ while (*r != NUL && *r == ' ') {
+ r++;
+ }
+ memmove(msgbuf, r, msgbuf + STRLEN(msgbuf) - r);
+ // overwrite old text
+ memset(r, ' ', msgbuf + STRLEN(msgbuf) - r);
}
- if (trunc != NULL) {
- msg_outtrans(trunc);
- xfree(trunc);
- } else
- msg_outtrans(msgbuf);
+ msg_outtrans(msgbuf);
msg_clr_eos();
msg_check();
- xfree(msgbuf);
- gotocmdline(FALSE);
+ gotocmdline(false);
ui_flush();
- msg_nowait = TRUE; /* don't wait for this message */
+ msg_nowait = true; // don't wait for this message
}
}
@@ -1217,8 +1254,16 @@ int do_search(
+ ((pat != NULL && *pat == ';') ? 0 : SEARCH_NOOF)))),
RE_LAST, (linenr_T)0, tm, timed_out);
- if (dircp != NULL)
- *dircp = dirc; /* restore second '/' or '?' for normal_cmd() */
+ if (dircp != NULL) {
+ *dircp = dirc; // restore second '/' or '?' for normal_cmd()
+ }
+
+ if (!shortmess(SHM_SEARCH)
+ && ((dirc == '/' && lt(pos, curwin->w_cursor))
+ || (dirc == '?' && lt(curwin->w_cursor, pos)))) {
+ os_delay(500L, false); // leave some time for top_bot_msg
+ }
+
if (c == FAIL) {
retval = 0;
goto end_do_search;
@@ -1260,16 +1305,25 @@ int do_search(
}
}
- /*
- * The search command can be followed by a ';' to do another search.
- * For example: "/pat/;/foo/+3;?bar"
- * This is like doing another search command, except:
- * - The remembered direction '/' or '?' is from the first search.
- * - When an error happens the cursor isn't moved at all.
- * Don't do this when called by get_address() (it handles ';' itself).
- */
- if (!(options & SEARCH_OPT) || pat == NULL || *pat != ';')
+ // Show [1/15] if 'S' is not in 'shortmess'.
+ if ((options & SEARCH_ECHO)
+ && messaging()
+ && !(cmd_silent + msg_silent)
+ && c != FAIL
+ && !shortmess(SHM_SEARCHCOUNT)
+ && msgbuf != NULL) {
+ search_stat(dirc, &pos, msgbuf);
+ }
+
+ // The search command can be followed by a ';' to do another search.
+ // For example: "/pat/;/foo/+3;?bar"
+ // This is like doing another search command, except:
+ // - The remembered direction '/' or '?' is from the first search.
+ // - When an error happens the cursor isn't moved at all.
+ // Don't do this when called by get_address() (it handles ';' itself).
+ if (!(options & SEARCH_OPT) || pat == NULL || *pat != ';') {
break;
+ }
dirc = *++pat;
if (dirc != '?' && dirc != '/') {
@@ -1288,7 +1342,7 @@ int do_search(
end_do_search:
if ((options & SEARCH_KEEP) || cmdmod.keeppatterns)
spats[0].off = old_off;
- xfree(strcopy);
+ xfree(msgbuf);
return retval;
}
@@ -4141,6 +4195,108 @@ int linewhite(linenr_T lnum)
return *p == NUL;
}
+// Add the search count "[3/19]" to "msgbuf".
+static void search_stat(int dirc, pos_T *pos, char_u *msgbuf)
+{
+ int save_ws = p_ws;
+ int wraparound = false;
+ pos_T p = (*pos);
+ static pos_T lastpos = { 0, 0, 0 };
+ static int cur = 0;
+ static int cnt = 0;
+ static int chgtick = 0;
+ static char_u *lastpat = NULL;
+ static buf_T *lbuf = NULL;
+ proftime_T start;
+#define OUT_OF_TIME 999
+
+ wraparound = ((dirc == '?' && lt(lastpos, p))
+ || (dirc == '/' && lt(p, lastpos)));
+
+ // If anything relevant changed the count has to be recomputed.
+ // STRNICMP ignores case, but we should not ignore case.
+ // Unfortunately, there is no STRNICMP function.
+ if (!(chgtick == buf_get_changedtick(curbuf)
+ && STRNICMP(lastpat, spats[last_idx].pat, STRLEN(lastpat)) == 0
+ && STRLEN(lastpat) == STRLEN(spats[last_idx].pat)
+ && equalpos(lastpos, curwin->w_cursor)
+ && lbuf == curbuf) || wraparound || cur < 0 || cur > 99) {
+ cur = 0;
+ cnt = 0;
+ clearpos(&lastpos);
+ lbuf = curbuf;
+ }
+
+ if (equalpos(lastpos, curwin->w_cursor) && !wraparound
+ && (dirc == '/' ? cur < cnt : cur > 0)) {
+ cur += dirc == '/' ? 1 : -1;
+ } else {
+ p_ws = false;
+ start = profile_setlimit(20L);
+ while (!got_int && searchit(curwin, curbuf, &lastpos, NULL,
+ FORWARD, NULL, 1, SEARCH_PEEK + SEARCH_KEEP,
+ RE_LAST, (linenr_T)0, NULL, NULL) != FAIL) {
+ // Stop after passing the time limit.
+ if (profile_passed_limit(start)) {
+ cnt = OUT_OF_TIME;
+ cur = OUT_OF_TIME;
+ break;
+ }
+ cnt++;
+ if (ltoreq(lastpos, p)) {
+ cur++;
+ }
+ fast_breakcheck();
+ if (cnt > 99) {
+ break;
+ }
+ }
+ if (got_int) {
+ cur = -1; // abort
+ }
+ }
+ if (cur > 0) {
+#define STAT_BUF_LEN 10
+ char t[STAT_BUF_LEN] = "";
+
+ if (curwin->w_p_rl && *curwin->w_p_rlc == 's') {
+ if (cur == OUT_OF_TIME) {
+ vim_snprintf(t, STAT_BUF_LEN, "[?/??]");
+ } else if (cnt > 99 && cur > 99) {
+ vim_snprintf(t, STAT_BUF_LEN, "[>99/>99]");
+ } else if (cnt > 99) {
+ vim_snprintf(t, STAT_BUF_LEN, "[>99/%d]", cur);
+ } else {
+ vim_snprintf(t, STAT_BUF_LEN, "[%d/%d]", cnt, cur);
+ }
+ } else {
+ if (cur == OUT_OF_TIME) {
+ vim_snprintf(t, STAT_BUF_LEN, "[?/??]");
+ } else if (cnt > 99 && cur > 99) {
+ vim_snprintf(t, STAT_BUF_LEN, "[>99/>99]");
+ } else if (cnt > 99) {
+ vim_snprintf(t, STAT_BUF_LEN, "[%d/>99]", cur);
+ } else {
+ vim_snprintf(t, STAT_BUF_LEN, "[%d/%d]", cur, cnt);
+ }
+ }
+ STRNCPY(msgbuf + STRLEN(msgbuf) - STRLEN(t), t, STRLEN(t));
+ if (dirc == '?' && cur == 100) {
+ cur = -1;
+ }
+
+ xfree(lastpat);
+ lastpat = vim_strsave(spats[last_idx].pat);
+ chgtick = buf_get_changedtick(curbuf);
+ lbuf = curbuf;
+ lastpos = p;
+
+ // keep the message even after redraw
+ give_warning(msgbuf, false);
+ }
+ p_ws = save_ws;
+}
+
/*
* Find identifiers or defines in included files.
* If p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase.
diff --git a/src/nvim/testdir/test_search_stat.vim b/src/nvim/testdir/test_search_stat.vim
new file mode 100644
index 0000000000..37e2fdaef5
--- /dev/null
+++ b/src/nvim/testdir/test_search_stat.vim
@@ -0,0 +1,108 @@
+" Tests for search_stats, when "S" is not in 'shortmess'
+"
+" This test is fragile, it might not work interactively, but it works when run
+" as test!
+
+func! Test_search_stat()
+ new
+ set shortmess-=S
+ call append(0, repeat(['foobar', 'foo', 'fooooobar', 'foba', 'foobar'], 10))
+
+ " 1) match at second line
+ call cursor(1, 1)
+ let @/ = 'fo*\(bar\?\)\?'
+ let g:a = execute(':unsilent :norm! n')
+ let stat = '\[2/50\]'
+ let pat = escape(@/, '()*?'). '\s\+'
+ call assert_match(pat .. stat, g:a)
+
+ " 2) Match at last line
+ call cursor(line('$')-2, 1)
+ let g:a = execute(':unsilent :norm! n')
+ let stat = '\[50/50\]'
+ call assert_match(pat .. stat, g:a)
+
+ " 3) No search stat
+ set shortmess+=S
+ call cursor(1, 1)
+ let stat = '\[2/50\]'
+ let g:a = execute(':unsilent :norm! n')
+ call assert_notmatch(pat .. stat, g:a)
+ set shortmess-=S
+
+ " 4) Many matches
+ call cursor(line('$')-2, 1)
+ let @/ = '.'
+ let pat = escape(@/, '()*?'). '\s\+'
+ let g:a = execute(':unsilent :norm! n')
+ let stat = '\[>99/>99\]'
+ call assert_match(pat .. stat, g:a)
+
+ " 5) Many matches
+ call cursor(1, 1)
+ let g:a = execute(':unsilent :norm! n')
+ let stat = '\[2/>99\]'
+ call assert_match(pat .. stat, g:a)
+
+ " 6) right-left
+ if exists("+rightleft")
+ set rl
+ call cursor(1,1)
+ let @/ = 'foobar'
+ let pat = 'raboof/\s\+'
+ let g:a = execute(':unsilent :norm! n')
+ let stat = '\[20/2\]'
+ call assert_match(pat .. stat, g:a)
+ set norl
+ endif
+
+ " 7) right-left bottom
+ if exists("+rightleft")
+ set rl
+ call cursor('$',1)
+ let pat = 'raboof?\s\+'
+ let g:a = execute(':unsilent :norm! N')
+ let stat = '\[20/20\]'
+ call assert_match(pat .. stat, g:a)
+ set norl
+ endif
+
+ " 8) right-left back at top
+ if exists("+rightleft")
+ set rl
+ call cursor('$',1)
+ let pat = 'raboof/\s\+'
+ let g:a = execute(':unsilent :norm! n')
+ let stat = '\[20/1\]'
+ call assert_match(pat .. stat, g:a)
+ call assert_match('search hit BOTTOM, continuing at TOP', g:a)
+ set norl
+ endif
+
+ " 9) normal, back at top
+ call cursor(1,1)
+ let @/ = 'foobar'
+ let pat = '?foobar\s\+'
+ let g:a = execute(':unsilent :norm! N')
+ let stat = '\[20/20\]'
+ call assert_match(pat .. stat, g:a)
+ call assert_match('search hit TOP, continuing at BOTTOM', g:a)
+
+ " 10) normal, no match
+ call cursor(1,1)
+ let @/ = 'zzzzzz'
+ let g:a = ''
+ try
+ let g:a = execute(':unsilent :norm! n')
+ catch /^Vim\%((\a\+)\)\=:E486/
+ let stat = ''
+ " error message is not redir'ed to g:a, it is empty
+ call assert_true(empty(g:a))
+ catch
+ call assert_false(1)
+ endtry
+
+ " close the window
+ set shortmess+=S
+ bwipe!
+endfunc
generated by cgit (git 2.34.1) at 2025-06-03 18:19:28 +0000