diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-05-14 19:57:00 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-05-14 20:05:39 +0800 |
| commit | dca0412d378131ca6c8a64f7adb8937493c43883 (patch) | |
| tree | 7e3015b0c62bc523f8171c905caffea99b6903d8 /src | |
| parent | 24eb1af4754b3061d0968112342ca5389b68d4f6 (diff) | |
| download | rneovim-dca0412d378131ca6c8a64f7adb8937493c43883.tar.gz rneovim-dca0412d378131ca6c8a64f7adb8937493c43883.tar.bz2 rneovim-dca0412d378131ca6c8a64f7adb8937493c43883.zip | |
vim-patch:8.2.4953: with 'si' inserting '}' after completion goes wrong
Problem: With 'smartindent' inserting '}' after completion goes wrong.
Solution: Check the cursor is in indent. (closes vim/vim#10420)
https://github.com/vim/vim/commit/2e444bbef0f36535bf941f007f2961f3f66bbe87
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_smartindent.vim | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index f2982aa187..215024f63a 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -9344,10 +9344,8 @@ static void ins_try_si(int c) /* * do some very smart indenting when entering '{' or '}' */ - if (((did_si || can_si_back) && c == '{') || (can_si && c == '}')) { - /* - * for '}' set indent equal to indent of line containing matching '{' - */ + if (((did_si || can_si_back) && c == '{') || (can_si && c == '}' && inindent(0))) { + // for '}' set indent equal to indent of line containing matching '{' if (c == '}' && (pos = findmatch(NULL, '{')) != NULL) { old_pos = curwin->w_cursor; /* diff --git a/src/nvim/testdir/test_smartindent.vim b/src/nvim/testdir/test_smartindent.vim index 3d685eb2fe..f3650a9ac4 100644 --- a/src/nvim/testdir/test_smartindent.vim +++ b/src/nvim/testdir/test_smartindent.vim @@ -67,6 +67,11 @@ func Test_si_after_completion() call setline(1, 'foo foot') call feedkeys("o f\<C-X>\<C-N>#", 'tx') call assert_equal(' foo#', getline(2)) + + call setline(2, '') + call feedkeys("1Go f\<C-X>\<C-N>}", 'tx') + call assert_equal(' foo}', getline(2)) + bwipe! endfunc |