IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1148: CTRL-L with 'incsearch' does not pick up char under cursor

Browse Source 
Problem:    CTRL-L with 'incsearch' does not pick up char under cursor.
            (Smylers)
Solution:   Do not compare the position with the cursor position. (Hirohito
            Higashi, closes vim/vim#3620)
730f48fe36
This commit is contained in:
Jan Edmund Lazo 2020-09-13 01:52:24 -04:00
parent 476c50903a
commit 25992df761
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/ex_getln.c
View File

@ -567,6 +567,7 @@ static void may_do_incsearch_highlighting(int firstc, long count,
// May set "*c" to the added character. // May set "*c" to the added character.
// Return OK when calling command_line_not_changed. // Return OK when calling command_line_not_changed.
static int may_add_char_to_search(int firstc, int *c, incsearch_state_T *s) static int may_add_char_to_search(int firstc, int *c, incsearch_state_T *s)
FUNC_ATTR_NONNULL_ALL
{ {
int skiplen, patlen; int skiplen, patlen;
@ -583,8 +584,8 @@ static int may_add_char_to_search(int firstc, int *c, incsearch_state_T *s)
if (s->did_incsearch) { if (s->did_incsearch) {
curwin->w_cursor = s->match_end; curwin->w_cursor = s->match_end;
if (!equalpos(curwin->w_cursor, s->search_start)) { *c = gchar_cursor();
*c = gchar_cursor(); if (*c != NUL) {
// If 'ignorecase' and 'smartcase' are set and the // If 'ignorecase' and 'smartcase' are set and the
// command line has no uppercase characters, convert // command line has no uppercase characters, convert
// the character to lowercase // the character to lowercase
@ -592,16 +593,14 @@ static int may_add_char_to_search(int firstc, int *c, incsearch_state_T *s)
&& !pat_has_uppercase(ccline.cmdbuff + skiplen)) { && !pat_has_uppercase(ccline.cmdbuff + skiplen)) {
*c = mb_tolower(*c); *c = mb_tolower(*c);
} }
if (*c != NUL) { if (*c == firstc
if (*c == firstc || vim_strchr((char_u *)(p_magic ? "\\~^$.*[" : "\\^$"), *c)
|| vim_strchr((char_u *)(p_magic ? "\\~^$.*[" : "\\^$"), *c) != NULL) {
!= NULL) { // put a backslash before special characters
// put a backslash before special characters stuffcharReadbuff(*c);
stuffcharReadbuff(*c); *c = '\\';
*c = '\\';
}
return FAIL;
} }
return FAIL;
} }
} }
return OK; return OK;

18
src/nvim/testdir/test_search.vim
View File

@ -1068,6 +1068,24 @@ func Test_one_error_msg()
call assert_fails('call search(" \\((\\v[[=P=]]){185}+ ")', 'E871:') call assert_fails('call search(" \\((\\v[[=P=]]){185}+ ")', 'E871:')
endfunc endfunc
func Test_incsearch_add_char_under_cursor()
throw 'skipped: Nvim does not support test_override()'
if !exists('+incsearch')
return
endif
set incsearch
new
call setline(1, ['find match', 'anything'])
1
call test_override('char_avail', 1)
call feedkeys("fc/m\<C-L>\<C-L>\<C-L>\<C-L>\<C-L>\<CR>", 'tx')
call assert_equal('match', @/)
call test_override('char_avail', 0)
set incsearch&
bwipe!
endfunc
" Test for the search() function with match at the cursor position " Test for the search() function with match at the cursor position
func Test_search_match_at_curpos() func Test_search_match_at_curpos()
new new