Problem: exists(':keepalt') return 0

Problem: exists(':keepalt') returns 0 Solution: use correct length when finding command, also ignore :{ and :} when expanding command line items fixes: vim#15305 Signed-off-by: Christian Brabandt <[email protected]>
chrisbra · Jul 25, 2024 · 9e3734e · 9e3734e
1 parent dc373d4
commit 9e3734e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
@@ -4057,7 +4057,7 @@ cmp_cmdmod_info(const void *a, const void *b)
     cmdmod_info_T *cm1 = (cmdmod_info_T *)a;
     cmdmod_info_T *cm2 = (cmdmod_info_T *)b;
 
-    return STRNCMP(cm1->name, cm2->name, cm2->minlen);
+    return STRNCMP(cm1->name, cm2->name, MAX(cm1->minlen, cm2->minlen));
 }
 
 /*
@@ -4119,7 +4119,7 @@ cmd_exists(char_u *name)
 	cmdmod_info_T	*entry;
 
 	target.name = (char *)name;
-	target.minlen = 0;		// not used, see cmp_cmdmod_info()
+	target.minlen = STRLEN(name);
 	target.has_count = FALSE;
 
 	// Check command modifiers.
@@ -5993,6 +5993,10 @@ get_command_name(expand_T *xp UNUSED, int idx)
 {
     if (idx >= (int)CMD_SIZE)
 	return expand_user_command_name(idx);
+    // the following are no real commands
+    if (STRNCMP(cmdnames[idx].cmd_name, "{", 1) == 0 ||
+        STRNCMP(cmdnames[idx].cmd_name, "}", 1) == 0)
+	return (char_u *)"";
     return cmdnames[idx].cmd_name;
 }
 

diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
@@ -3870,4 +3870,25 @@ func Test_term_option()
   let &cpo = _cpo
 endfunc
 
+func Test_ex_command_completion()
+  " required for :*
+  set cpo+=*
+  let list = filter(getcompletion('', 'command'), 'exists(":" . v:val) == 0')
+  " :++ and :-- are only valid in Vim9 Script context, so they can be ignored
+  call assert_equal(['++', '--'], sort(list))
+  call assert_equal(1, exists(':k'))
+  call assert_equal(0, exists(':ke'))
+  call assert_equal(1, exists(':kee'))
+  call assert_equal(1, exists(':keep'))
+  call assert_equal(1, exists(':keepm'))
+  call assert_equal(1, exists(':keepma'))
+  call assert_equal(1, exists(':keepmar'))
+  call assert_equal(1, exists(':keepmark'))
+  call assert_equal(2, exists(':keepmarks'))
+  call assert_equal(2, exists(':keepalt'))
+  call assert_equal(2, exists(':keepjumps'))
+  call assert_equal(2, exists(':keeppatterns'))
+  set cpo-=*
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab