Mercurial > vim
changeset 20697:1260b27535b5 v8.2.0902
patch 8.2.0902: using searchcount() in 'statusline' causes an error
Commit: https://github.com/vim/vim/commit/442a85369f3eb9834dbab42add45f7c4106700f4
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jun 4 20:56:09 2020 +0200
patch 8.2.0902: using searchcount() in 'statusline' causes an error
Problem: Using searchcount() in 'statusline' causes an error.
Solution: Avoid saving/restoring the search patten recursively.
(closes #6194)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 04 Jun 2020 21:00:03 +0200 |
parents | 5e91479ba748 |
children | 6796c711aa85 |
files | src/search.c src/testdir/dumps/Test_searchstat_4.dump src/testdir/test_search_stat.vim src/version.c |
diffstat | 4 files changed, 48 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -356,10 +356,9 @@ static int saved_no_hlsearch = 0; void save_last_search_pattern(void) { - if (did_save_last_search_spat != 0) - iemsg("did_save_last_search_spat is not zero"); - else - ++did_save_last_search_spat; + if (++did_save_last_search_spat != 1) + // nested call, nothing to do + return; saved_last_search_spat = spats[RE_SEARCH]; if (spats[RE_SEARCH].pat != NULL) @@ -371,12 +370,14 @@ save_last_search_pattern(void) void restore_last_search_pattern(void) { - if (did_save_last_search_spat != 1) + if (--did_save_last_search_spat > 0) + // nested call, nothing to do + return; + if (did_save_last_search_spat != 0) { - iemsg("did_save_last_search_spat is not one"); + iemsg("restore_last_search_pattern() called more often than save_last_search_pattern()"); return; } - --did_save_last_search_spat; vim_free(spats[RE_SEARCH].pat); spats[RE_SEARCH] = saved_last_search_spat;
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_searchstat_4.dump @@ -0,0 +1,10 @@ +|t+0&#ffffff0|h|i|s| |i|s| |s+1&&|o|m|e|t|h|i|n|g| +0&&@57 +@75 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|[+3#0000000&|1|/|1|]| @69 +|/+0&&|s|o|m|e|t|h|i|n|g> @64
--- a/src/testdir/test_search_stat.vim +++ b/src/testdir/test_search_stat.vim @@ -263,6 +263,34 @@ func Test_searchcount_fails() call assert_fails('echo searchcount("boo!")', 'E715:') endfunc +func Test_searchcount_in_statusline() + CheckScreendump + + let lines =<< trim END + set shortmess-=S + call append(0, 'this is something') + function TestSearchCount() abort + let search_count = searchcount() + if !empty(search_count) + return '[' . search_count.current . '/' . search_count.total . ']' + else + return '' + endif + endfunction + set hlsearch + set laststatus=2 statusline+=%{TestSearchCount()} + END + call writefile(lines, 'Xsearchstatusline') + let buf = RunVimInTerminal('-S Xsearchstatusline', #{rows: 10}) + call TermWait(buf) + call term_sendkeys(buf, "/something") + call VerifyScreenDump(buf, 'Test_searchstat_4', {}) + + call term_sendkeys(buf, "\<Esc>") + call StopVimInTerminal(buf) + call delete('Xsearchstatusline') +endfunc + func Test_search_stat_foldopen() CheckScreendump