From 744d96bd769b99b145bb40363598c85f363de9e1 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 10 Aug 2025 08:05:33 +0800 Subject: [PATCH] vim-patch:9.1.1612: Ctrl-G/Ctrl-T do not ignore the end search delimiter Problem: Ctrl-G/Ctrl-T does not ignore the end search delimiter (irisjae) Solution: Check if the pattern ends with a search delimiter and ignore it, unless it is part of the pattern. fixes: vim/vim#17895 closes: vim/vim#17933 https://github.com/vim/vim/commit/c03990d30f742154d93184383cae713b69f1147c Co-authored-by: Christian Brabandt (cherry picked from commit 1eca030fb2dd53d99608db744a511a182c6a2347) --- src/nvim/ex_getln.c | 14 ++++ test/functional/legacy/search_spec.lua | 105 +++++++++++++++++++++++++ test/old/testdir/test_search.vim | 81 +++++++++++++++++++ 3 files changed, 200 insertions(+) diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 1d68fbbb0d..645e71eefa 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1470,6 +1470,17 @@ static int may_do_command_line_next_incsearch(int firstc, int count, incsearch_s pat = ccline.cmdbuff + skiplen; } + bool bslsh = false; + // do not search for the search end delimiter, + // unless it is part of the pattern + if (patlen > 2 && firstc == pat[patlen - 1]) { + patlen--; + if (pat[patlen - 1] == '\\') { + pat[patlen - 1] = (char)(uint8_t)firstc; + bslsh = true; + } + } + if (next_match) { t = s->match_end; if (lt(s->match_start, s->match_end)) { @@ -1493,6 +1504,9 @@ static int may_do_command_line_next_incsearch(int firstc, int count, incsearch_s RE_SEARCH, NULL); emsg_off--; pat[patlen] = save; + if (bslsh) { + pat[patlen - 1] = '\\'; + } ui_busy_stop(); if (found) { s->search_start = s->match_start; diff --git a/test/functional/legacy/search_spec.lua b/test/functional/legacy/search_spec.lua index 2678f11971..13a55e82b5 100644 --- a/test/functional/legacy/search_spec.lua +++ b/test/functional/legacy/search_spec.lua @@ -731,6 +731,111 @@ describe('search cmdline', function() feed('') screen:expect(s) end) + + -- oldtest: Test_incsearch_delimiter_ctrlg() + it('incsearch does not include trailing delimiter', function() + screen:try_resize(20, 6) + exec([[ + set incsearch hls + call setline(1, ["1 vim inc", "2 vim /", "3 vim /", "4 vim ?", "5 vim ?"]) + normal gg + redraw + ]]) + + feed('/') + poke_eventloop() + feed('v') + poke_eventloop() + feed('i') + poke_eventloop() + feed('m') + poke_eventloop() + feed(' ') + poke_eventloop() + feed('/') + poke_eventloop() + feed('') + screen:expect([[ + 1 {10:vim }inc | + 2 {2:vim }/ | + 3 {10:vim }/ | + 4 {10:vim }? | + 5 {10:vim }? | + /vim /^ | + ]]) + feed('') + + command('5') + feed('?') + poke_eventloop() + feed('v') + poke_eventloop() + feed('i') + poke_eventloop() + feed('m') + poke_eventloop() + feed(' ') + poke_eventloop() + feed('?') + poke_eventloop() + feed('') + screen:expect([[ + 1 {10:vim }inc | + 2 {10:vim }/ | + 3 {2:vim }/ | + 4 {10:vim }? | + 5 {10:vim }? | + ?vim ?^ | + ]]) + feed('') + + feed('/') + poke_eventloop() + feed('v') + poke_eventloop() + feed('i') + poke_eventloop() + feed('m') + poke_eventloop() + feed(' ') + poke_eventloop() + feed('\\/') + poke_eventloop() + feed('') + screen:expect([[ + 1 vim inc | + 2 {10:vim /} | + 3 {2:vim /} | + 4 vim ? | + 5 vim ? | + /vim \/^ | + ]]) + feed('') + + command('5') + feed('?') + poke_eventloop() + feed('v') + poke_eventloop() + feed('i') + poke_eventloop() + feed('m') + poke_eventloop() + feed(' ') + poke_eventloop() + feed('\\?') + poke_eventloop() + feed('') + screen:expect([[ + 1 vim inc | + 2 vim / | + 3 vim / | + 4 {10:vim ?} | + 5 {2:vim ?} | + ?vim \?^ | + ]]) + feed('') + end) end) describe('Search highlight', function() diff --git a/test/old/testdir/test_search.vim b/test/old/testdir/test_search.vim index 538d375fab..fcfa5bd30e 100644 --- a/test/old/testdir/test_search.vim +++ b/test/old/testdir/test_search.vim @@ -2130,5 +2130,86 @@ func Test_search_with_invalid_range() bwipe! endfunc +func Test_incsearch_delimiter_ctrlg() + CheckOption incsearch + CheckScreendump + CheckRunVimInTerminal + call assert_equal(0, &scrolloff) + call writefile([ + \ 'set incsearch hls', + \ 'call setline(1, ["1 vim inc", "2 vim /", "3 vim /", "4 vim ?", "5 vim ?"])', + \ 'normal gg', + \ 'redraw', + \ ], 'Xscript_incsearch_delim', 'D') + let buf = RunVimInTerminal('-S Xscript_incsearch_delim', {'rows': 6}) + + call term_sendkeys(buf, '/') + sleep 100m + call term_sendkeys(buf, 'v') + sleep 100m + call term_sendkeys(buf, 'i') + sleep 100m + call term_sendkeys(buf, 'm') + sleep 100m + call term_sendkeys(buf, ' ') + sleep 100m + call term_sendkeys(buf, '/') + sleep 100m + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_incsearch_delim_01', {}) + call term_sendkeys(buf, "\") + + call term_sendkeys(buf, ":5\") + call term_sendkeys(buf, '?') + sleep 100m + call term_sendkeys(buf, 'v') + sleep 100m + call term_sendkeys(buf, 'i') + sleep 100m + call term_sendkeys(buf, 'm') + sleep 100m + call term_sendkeys(buf, ' ') + sleep 100m + call term_sendkeys(buf, '?') + sleep 100m + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_incsearch_delim_02', {}) + call term_sendkeys(buf, "\") + + call term_sendkeys(buf, '/') + sleep 100m + call term_sendkeys(buf, 'v') + sleep 100m + call term_sendkeys(buf, 'i') + sleep 100m + call term_sendkeys(buf, 'm') + sleep 100m + call term_sendkeys(buf, ' ') + sleep 100m + call term_sendkeys(buf, '\/') + sleep 100m + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_incsearch_delim_03', {}) + call term_sendkeys(buf, "\") + + call term_sendkeys(buf, ":5\") + call term_sendkeys(buf, '?') + sleep 100m + call term_sendkeys(buf, 'v') + sleep 100m + call term_sendkeys(buf, 'i') + sleep 100m + call term_sendkeys(buf, 'm') + sleep 100m + call term_sendkeys(buf, ' ') + sleep 100m + call term_sendkeys(buf, '\?') + sleep 100m + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_incsearch_delim_04', {}) + call term_sendkeys(buf, "\") + + call StopVimInTerminal(buf) +endfunc " vim: shiftwidth=2 sts=2 expandtab