mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.3583: the "gd" and "gD" commands do not update search stats
Problem: The "gd" and "gD" commands do not update search stats. (Gary Johnson) Solution: Clear search stats.
This commit is contained in:
parent
113cb513f7
commit
0c71114aed
10
src/normal.c
10
src/normal.c
@ -2306,11 +2306,19 @@ nv_gd(
|
|||||||
if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0
|
if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0
|
||||||
|| find_decl(ptr, len, nchar == 'd', thisblock, SEARCH_START)
|
|| find_decl(ptr, len, nchar == 'd', thisblock, SEARCH_START)
|
||||||
== FAIL)
|
== FAIL)
|
||||||
|
{
|
||||||
clearopbeep(oap);
|
clearopbeep(oap);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
#ifdef FEAT_FOLDING
|
#ifdef FEAT_FOLDING
|
||||||
else if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)
|
if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)
|
||||||
foldOpenCursor();
|
foldOpenCursor();
|
||||||
#endif
|
#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
10
src/testdir/dumps/Test_searchstatgd_1.dump
Normal 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
10
src/testdir/dumps/Test_searchstatgd_2.dump
Normal 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|
|
@ -355,4 +355,29 @@ func! Test_search_stat_screendump()
|
|||||||
call delete('Xsearchstat')
|
call delete('Xsearchstat')
|
||||||
endfunc
|
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
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@ -757,6 +757,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
3583,
|
||||||
/**/
|
/**/
|
||||||
3582,
|
3582,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user