aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4953: with 'si' inserting '}' after completion goes wrong

Browse Source 
Problem:    With 'smartindent' inserting '}' after completion goes wrong.
Solution:   Check the cursor is in indent.  (closes #10420)
This commit is contained in:
Bram Moolenaar 2022-05-14 12:54:23 +01:00
parent 98feacedf9
commit 2e444bbef0
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/indent.c
View File

@ -1197,7 +1197,8 @@ ins_try_si(int c)
int temp; int temp;
// do some very smart indenting when entering '{' or '}' // do some very smart indenting when entering '{' or '}'
if (((did_si || can_si_back) && c == '{') || (can_si && c == '}')) if (((did_si || can_si_back) && c == '{')
|| (can_si && c == '}' && inindent(0)))
{ {
// for '}' set indent equal to indent of line containing matching '{' // for '}' set indent equal to indent of line containing matching '{'
if (c == '}' && (pos = findmatch(NULL, '{')) != NULL) if (c == '}' && (pos = findmatch(NULL, '{')) != NULL)

5
src/testdir/test_smartindent.vim
View File

@ -140,6 +140,11 @@ func Test_si_after_completion()
call setline(1, 'foo foot') call setline(1, 'foo foot')
call feedkeys("o f\<C-X>\<C-N>#", 'tx') call feedkeys("o f\<C-X>\<C-N>#", 'tx')
call assert_equal(' foo#', getline(2)) 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! bwipe!
endfunc endfunc

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4953,
/**/ /**/
4952, 4952,
/**/ /**/