From: Christian Brabandt <cb@256bit.org>
Date: Thu, 7 Apr 2022 20:00:53 +0000 (+0100)
Subject: patch 8.2.4710: smart indenting does not work after completion
X-Git-Tag: v8.2.4710
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac72c21da696cf6c31630a9e5ff4c0d3e2049c11;p=vim

patch 8.2.4710: smart indenting does not work after completion

Problem:    Smart indenting does not work after completion.
Solution:   Set "can_si". (Christian Brabandt, closes #10113, closes #558)
---

diff --git a/src/edit.c b/src/edit.c
index 53e86ff18..f30edd5c7 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1293,6 +1293,9 @@ docomplete:
 	    disable_fold_update--;
 #endif
 	    compl_busy = FALSE;
+#ifdef FEAT_SMARTINDENT
+	    can_si = TRUE; // allow smartindenting
+#endif
 	    break;
 
 	case Ctrl_Y:	// copy from previous line or scroll down
diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 3712abe69..75ec03cb3 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -2132,4 +2132,23 @@ func Test_thesaurusfunc_callback()
   %bw!
 endfunc
 
+func FooBarComplete(findstart, base)
+  if a:findstart
+    return col('.') - 1
+  else
+    return ["Foo", "Bar", "}"]
+  endif
+endfunc
+
+func Test_complete_smartindent()
+  new
+  setlocal smartindent completefunc=FooBarComplete
+
+  exe "norm! o{\<cr>\<c-x>\<c-u>\<c-p>}\<cr>\<esc>"
+  let result = getline(1,'$')
+  call assert_equal(['', '{','}',''], result)
+  bw!
+  delfunction! FooBarComplete
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 7eec582d9..956100304 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4710,
 /**/
     4709,
 /**/