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.0.1419: cursor column is not updated after ]s

Browse Source 
Problem:    Cursor column is not updated after ]s. (Gary Johnson)
Solution:   Set the curswant flag.

b73fa629d6
This commit is contained in:
Justin M. Keyes 2018-01-16 00:08:31 +01:00
parent 6020e8b69e
commit b558f750bf
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/eval.c
View File

@ -15538,6 +15538,7 @@ static void f_spellbadword(typval_T *argvars, typval_T *rettv, FunPtr fptr)
len = spell_move_to(curwin, FORWARD, true, true, &attr); len = spell_move_to(curwin, FORWARD, true, true, &attr);
if (len != 0) { if (len != 0) {
word = (char *)get_cursor_pos_ptr(); word = (char *)get_cursor_pos_ptr();
curwin->w_set_curswant = true;
} }
} else if (curwin->w_p_spell && *curbuf->b_s.b_p_spl != NUL) { } else if (curwin->w_p_spell && *curbuf->b_s.b_p_spl != NUL) {
const char *str = tv_get_string_chk(&argvars[0]); const char *str = tv_get_string_chk(&argvars[0]);

2
src/nvim/normal.c
View File

@ -5687,6 +5687,8 @@ static void nv_brackets(cmdarg_T *cap)
cap->nchar == 's', false, NULL) == 0) { cap->nchar == 's', false, NULL) == 0) {
clearopbeep(cap->oap); clearopbeep(cap->oap);
break; break;
} else {
curwin->w_set_curswant = true;
} }
if (cap->oap->op_type == OP_NOP && (fdo_flags & FDO_SEARCH) && KeyTyped) if (cap->oap->op_type == OP_NOP && (fdo_flags & FDO_SEARCH) && KeyTyped)
foldOpenCursor(); foldOpenCursor();

31
src/nvim/testdir/test_spell.vim
View File

@ -28,6 +28,37 @@ func Test_wrap_search()
set nospell set nospell
endfunc endfunc
func Test_curswant()
new
call setline(1, ['Another plong line', 'abcdefghijklmnopq'])
set spell wrapscan
normal 0]s
call assert_equal('plong', expand('<cword>'))
normal j
call assert_equal(9, getcurpos()[2])
normal 0[s
call assert_equal('plong', expand('<cword>'))
normal j
call assert_equal(9, getcurpos()[2])
normal 0]S
call assert_equal('plong', expand('<cword>'))
normal j
call assert_equal(9, getcurpos()[2])
normal 0[S
call assert_equal('plong', expand('<cword>'))
normal j
call assert_equal(9, getcurpos()[2])
normal 1G0
call assert_equal('plong', spellbadword()[0])
normal j
call assert_equal(9, getcurpos()[2])
bwipe!
set nospell
endfunc
func Test_z_equal_on_invalid_utf8_word() func Test_z_equal_on_invalid_utf8_word()
split split
set spell set spell