# HG changeset patch # User Bram Moolenaar # Date 1652529603 -7200 # Node ID 3942ea75b4c0b7966b18c32b0a1eca209dd49b33 # Parent f03467bfe27ca259efc3a46bc944f47c5a6c653f patch 8.2.4953: with 'si' inserting '}' after completion goes wrong Commit: https://github.com/vim/vim/commit/2e444bbef0f36535bf941f007f2961f3f66bbe87 Author: Bram Moolenaar Date: Sat May 14 12:54:23 2022 +0100 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 https://github.com/vim/vim/issues/10420) diff --git a/src/indent.c b/src/indent.c --- a/src/indent.c +++ b/src/indent.c @@ -1197,7 +1197,8 @@ ins_try_si(int c) int temp; // 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 '{' if (c == '}' && (pos = findmatch(NULL, '{')) != NULL) diff --git a/src/testdir/test_smartindent.vim b/src/testdir/test_smartindent.vim --- a/src/testdir/test_smartindent.vim +++ b/src/testdir/test_smartindent.vim @@ -140,6 +140,11 @@ func Test_si_after_completion() call setline(1, 'foo foot') call feedkeys("o f\\#", 'tx') call assert_equal(' foo#', getline(2)) + + call setline(2, '') + call feedkeys("1Go f\\}", 'tx') + call assert_equal(' foo}', getline(2)) + bwipe! endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4953, +/**/ 4952, /**/ 4951,