aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3583: the "gd" and "gD" commands do not update search stats

Browse Source 
Problem:    The "gd" and "gD" commands do not update search stats. (Gary
            Johnson)
Solution:   Clear search stats.
This commit is contained in:
Bram Moolenaar 2021-11-12 10:30:04 +00:00
parent 113cb513f7
commit 0c71114aed
5 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/normal.c
View File

@ -2305,12 +2305,20 @@ nv_gd(
if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0
|| find_decl(ptr, len, nchar == 'd', thisblock, SEARCH_START)
== FAIL)
== FAIL)
{
clearopbeep(oap);
}
else
{
#ifdef FEAT_FOLDING
else if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)
foldOpenCursor();
if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)
foldOpenCursor();
#endif
// clear any search statistics
if (messaging() && !msg_silent && !shortmess(SHM_SEARCHCOUNT))
clear_cmdline = TRUE;
}
}
/*

10
src/testdir/dumps/Test_searchstatgd_1.dump Normal file
View File

@ -0,0 +1,10 @@
|i+0&#ffffff0|n|t| |c|a|t|;| @66
|i|n|t| >d+0&#ffff4012|o|g|;+0&#ffffff0| @66
|c|a|t| |=| |d+0&#ffff4012|o|g|;+0&#ffffff0| @64
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|/+0#0000000&|d|o|g| @35|[|1|/|2|]| @11|2|,|5| @10|A|l@1|

10
src/testdir/dumps/Test_searchstatgd_2.dump Normal file
View File

@ -0,0 +1,10 @@
|i+0&#ffffff0|n|t| >c+0&#ffff4012|a|t|;+0&#ffffff0| @66
|i|n|t| |d|o|g|;| @66
|c+0&#ffff4012|a|t| +0&#ffffff0|=| |d|o|g|;| @64
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
| +0#0000000&@56|1|,|5| @10|A|l@1|

25
src/testdir/test_search_stat.vim
View File

@ -355,4 +355,29 @@ func! Test_search_stat_screendump()
call delete('Xsearchstat')
endfunc
func Test_search_stat_then_gd()
CheckScreendump
let lines =<< trim END
call setline(1, ['int cat;', 'int dog;', 'cat = dog;'])
set shortmess-=S
set hlsearch
END
call writefile(lines, 'Xsearchstatgd')
let buf = RunVimInTerminal('-S Xsearchstatgd', #{rows: 10})
call term_sendkeys(buf, "/dog\<CR>")
call TermWait(buf)
call VerifyScreenDump(buf, 'Test_searchstatgd_1', {})
call term_sendkeys(buf, "G0gD")
call TermWait(buf)
call VerifyScreenDump(buf, 'Test_searchstatgd_2', {})
call StopVimInTerminal(buf)
call delete('Xsearchstatgd')
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3583,
/**/
3582,
/**/