Mercurial > vim
changeset 20573:00fff78a929a v8.2.0840
patch 8.2.0840: search match count wrong when only match is in fold
Commit: https://github.com/vim/vim/commit/6cb0726215519fe94103803e4aa77a355384bcf2
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 29 22:49:43 2020 +0200
patch 8.2.0840: search match count wrong when only match is in fold
Problem: Search match count wrong when only match is in fold.
Solution: Update search stats when in a closed fold. (Christian Brabandt,
closes #6160, closes #6152)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 29 May 2020 23:00:04 +0200 |
| parents | 8dd549c6de33 |
| children | 856b79787807 |
| files | src/search.c src/testdir/dumps/Test_searchstat_3.dump src/testdir/test_search_stat.vim src/version.c |
| diffstat | 4 files changed, 47 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -1592,7 +1592,12 @@ do_search( && !shortmess(SHM_SEARCHCOUNT) && msgbuf != NULL) search_stat(dirc, &pos, show_top_bot_msg, msgbuf, - (count != 1 || has_offset)); + (count != 1 || has_offset +#ifdef FEAT_FOLDING + || (!(fdo_flags & FDO_SEARCH) && + hasFolding(curwin->w_cursor.lnum, NULL, NULL)) +#endif + )); /* * The search command can be followed by a ';' to do another search.
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_searchstat_3.dump @@ -0,0 +1,10 @@ +|i+0&#ffffff0|f| @72 +>++0#0000e05#a8a8a8255|-@1| @1|2| |l|i|n|e|s|:| |f|o@1|-@57 +|e+0#0000000#ffffff0|n|d|i|f| @69 +@75 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|/+0#0000000&|f|o@1| @35|[|1|/|2|]| @11|2|,|2|-|1| @8|A|l@1|
--- a/src/testdir/test_search_stat.vim +++ b/src/testdir/test_search_stat.vim @@ -186,6 +186,35 @@ func Test_search_stat() bwipe! endfunc +func Test_search_stat_foldopen() + CheckScreendump + + let lines =<< trim END + set shortmess-=S + setl foldenable foldmethod=indent foldopen-=search + call append(0, ['if', "\tfoo", "\tfoo", 'endif']) + let @/ = 'foo' + call cursor(1,1) + norm n + END + call writefile(lines, 'Xsearchstat1') + + let buf = RunVimInTerminal('-S Xsearchstat1', #{rows: 10}) + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_searchstat_3', {}) + + call term_sendkeys(buf, "n") + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_searchstat_3', {}) + + call term_sendkeys(buf, "n") + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_searchstat_3', {}) + + call StopVimInTerminal(buf) + call delete('Xsearchstat1') +endfunc + func! Test_search_stat_screendump() CheckScreendump