patch 9.1.1057: Superfluous cleanup steps in test_ins_complete.vim

Problem:  Superfluous cleanup steps in test_ins_complete.vim.
Solution: Remove unnecessary :bw! and :autocmd! commands.
          Also remove unnecessary STRLEN() in insexpand.c
          (zeertzjq)

closes: #16542

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/insexpand.c b/src/insexpand.c
index 3b9494bb216dcb412fe21e1afc20ffd537e971c8..63b779dd18aed1bbfd3ba1f0a40c21350df86847 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -4374,16 +4374,17 @@ ins_compl_insert(int in_compl_func, int move_cursor)
 {
     int            compl_len = get_compl_len();
     int            preinsert = ins_compl_has_preinsert();
-    char_u  *str = compl_shown_match->cp_str.string;
-    int            leader_len = ins_compl_leader_len();
+    char_u  *cp_str = compl_shown_match->cp_str.string;
+    size_t  cp_str_len = compl_shown_match->cp_str.length;
+    size_t  leader_len = ins_compl_leader_len();
 
     // Make sure we don't go over the end of the string, this can happen with
     // illegal bytes.
-    if (compl_len < (int)compl_shown_match->cp_str.length)
+    if (compl_len < (int)cp_str_len)
     {
-       ins_compl_insert_bytes(str + compl_len, -1);
+       ins_compl_insert_bytes(cp_str + compl_len, -1);
        if (preinsert && move_cursor)
-           curwin->w_cursor.col -= ((size_t)STRLEN(str) - leader_len);
+           curwin->w_cursor.col -= (colnr_T)(cp_str_len - leader_len);
     }
     if (match_at_original_text(compl_shown_match) || preinsert)
        compl_used_match = FALSE;

diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index e4bc98ac9de42277ddd20925eeb5a22a222e492f..d0f90c881000df393511e0d3c5a27463450d08ba 100644 (file)
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -2988,7 +2988,6 @@ func Test_complete_info_matches()
     \], g:compl_info['items'])
   call assert_false(has_key(g:compl_info, 'matches'))
 
-  bw!
   bw!
   unlet g:what
   delfunc ShownInfo
@@ -3019,7 +3018,6 @@ func Test_complete_info_completed()
   call feedkeys("Go\<C-X>\<C-N>\<F5>\<Esc>dd", 'tx')
   call assert_equal({}, g:compl_info)
 
-  bw!
   bw!
   delfunc ShownInfo
   set cot&
@@ -3082,7 +3080,7 @@ function Test_completeopt_preinsert()
   call assert_equal("hello  fobar wo", getline('.'))
   call feedkeys("\<C-E>\<ESC>", 'tx')
 
-  " confrim
+  " confirm
   call feedkeys("S\<C-X>\<C-O>f\<C-Y>", 'tx')
   call assert_equal("fobar", getline('.'))
   call assert_equal(5, col('.'))
@@ -3134,12 +3132,10 @@ function Test_completeopt_preinsert()
   call assert_equal("fobar", getline('.'))
   call assert_equal(5, col('.'))
 
-  bw!
   bw!
   set cot&
   set omnifunc&
   delfunc Omni_test
-  autocmd! CompleteChanged
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab nofoldenable

diff --git a/src/version.c b/src/version.c
index 836f0a84468b8a8874ff67a3d2746ecee2d925c8..edec15eebb8093d4a8a51f3c08735a3d9b296ab4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1057,
 /**/
     1056,
 /**/