changeset 28860:3942ea75b4c0 v8.2.4953

patch 8.2.4953: with 'si' inserting '}' after completion goes wrong Commit: https://github.com/vim/vim/commit/2e444bbef0f36535bf941f007f2961f3f66bbe87 Author: Bram Moolenaar <Bram@vim.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Sat, 14 May 2022 14:00:03 +0200
parents f03467bfe27c
children d1bc3ca0cd1d
files src/indent.c src/testdir/test_smartindent.vim src/version.c
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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\<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
 
--- 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,