patch 9.1.0748: :keep* commmands are sometimes misidentified as :k
Commit:
https://github.com/vim/vim/commit/ea84202372061be9b5a9d16b360d5a17d93ccf7e
Author: Doug Kearns <dougkea...@gmail.com>
Date: Sun Sep 29 17:17:41 2024 +0200
patch 9.1.0748: :keep* commmands are sometimes misidentified as :k
Problem: The :keep{alt,jumps,marks,patterns} commmands are sometimes
misidentified as :k.
Solution: Make sure one_letter_cmd() only returns true for :k and not
other :keep* commands (Doug Kearns).
This currently manifests as missing completion for :keep* commands and
incorrect results from fullcommand().
E.g., fullcommand("keepmarks") returns "k" rather than "keepmarks".
The correct command, however, is executed as command modifiers are
handled specially in do_one_cmd() rather than using find_ex_command().
Fix exists(':k') so that it returns 2 for a full match.
closes: #15742
Signed-off-by: Doug Kearns <dougkea...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index a24b4efbc..32cd7c560 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3584,7 +3584,9 @@ skip_option_env_lead(char_u *start)
/*
* Return TRUE and set "*idx" if "p" points to a one letter command.
* If not in Vim9 script:
- * - The 'k' command can directly be followed by any character.
+ * - The 'k' command can directly be followed by any character
+ * but :keepa[lt] is another command, as are :keepj[umps],
+ * :kee[pmarks] and :keepp[atterns].
* - The 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
* but :sre[wind] is another command, as are :scr[iptnames],
* :scs[cope], :sim[alt], :sig[ns] and :sil[ent].
@@ -3594,7 +3596,8 @@ one_letter_cmd(char_u *p, cmdidx_T *idx)
{
if (in_vim9script())
return FALSE;
- if (*p == 'k')
+ if (p[0] == 'k'
+ && (p[1] != 'e' || (p[1] == 'e' && p[2] != 'e')))
{
*idx = CMD_k;
return TRUE;
@@ -3880,6 +3883,8 @@ find_ex_command(
if (one_letter_cmd(p, &eap->cmdidx))
{
++p;
+ if (full != NULL)
+ *full = TRUE;
}
else
{
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 708f211c6..4fec1c1c8 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -1195,6 +1195,10 @@ func Test_cmdline_complete_various()
call feedkeys(":ka\<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"ka\<C-A>", @:)
+ " completion for :keepmarks command
+ call feedkeys(":kee edi\<C-A>\<C-B>\"\<CR>", 'xt')
+ call assert_equal("\"kee edit", @:)
+
" completion for short version of the :s command
call feedkeys(":sI \<C-A>\<C-B>\"\<CR>", 'xt')
call assert_equal("\"sI \<C-A>", @:)
@@ -3901,7 +3905,7 @@ func Test_ex_command_completion()
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(2, exists(':k'))
call assert_equal(0, exists(':ke'))
call assert_equal(1, exists(':kee'))
call assert_equal(1, exists(':keep'))
diff --git a/src/testdir/test_cmdmods.vim b/src/testdir/test_cmdmods.vim
index 66ff6a1fa..a9117e153 100644
--- a/src/testdir/test_cmdmods.vim
+++ b/src/testdir/test_cmdmods.vim
@@ -40,6 +40,44 @@ def Test_cmdmods_array()
bwipe!
enddef
+def Test_keep_cmdmods_names()
+ # :k only available in legacy script
+ legacy call assert_equal('k', fullcommand(':k'))
+ legacy call assert_equal('k', fullcommand(':ke'))
+ # single character commands not supported in Vim9
+ assert_equal('', fullcommand(':k'))
+ assert_equal('keepmarks', fullcommand(':ke'))
+ assert_equal('keepmarks', fullcommand(':kee'))
+ assert_equal('keepmarks', fullcommand(':keep'))
+ assert_equal('keepmarks', fullcommand(':keepm'))
+ assert_equal('keepmarks', fullcommand(':keepma'))
+ assert_equal('keepmarks', fullcommand(':keepmar'))
+ assert_equal('keepmarks', fullcommand(':keepmark'))
+ assert_equal('keepmarks', fullcommand(':keepmarks'))
+ assert_equal('keepalt', fullcommand(':keepa'))
+ assert_equal('keepalt', fullcommand(':keepal'))
+ assert_equal('keepalt', fullcommand(':keepalt'))
+ assert_equal('keepjumps', fullcommand(':keepj'))
+ assert_equal('keepjumps', fullcommand(':keepju'))
+ assert_equal('keepjumps', fullcommand(':keepjum'))
+ assert_equal('keepjumps', fullcommand(':keepjump'))
+ assert_equal('keepjumps', fullcommand(':keepjumps'))
+ assert_equal('keeppatterns', fullcommand(':keepp'))
+ assert_equal('keeppatterns', fullcommand(':keeppa'))
+ assert_equal('keeppatterns', fullcommand(':keeppat'))
+ assert_equal('keeppatterns', fullcommand(':keeppatt'))
+ assert_equal('keeppatterns', fullcommand(':keeppatte'))
+ assert_equal('keeppatterns', fullcommand(':keeppatter'))
+ assert_equal('keeppatterns', fullcommand(':keeppattern'))
+ assert_equal('keeppatterns', fullcommand(':keeppatterns'))
+enddef
+
+def Test_cmdmod_completion()
+ assert_equal('edit', getcompletion('keepalt ed', 'cmdline')[0])
+ assert_equal('edit', getcompletion('keepjumps ed', 'cmdline')[0])
+ assert_equal('edit', getcompletion('keepmarks ed', 'cmdline')[0])
+ assert_equal('edit', getcompletion('keeppatterns ed', 'cmdline')[0])
+enddef
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_exists.vim b/src/testdir/test_exists.vim
index 9cdb3fb5c..404b15c0d 100644
--- a/src/testdir/test_exists.vim
+++ b/src/testdir/test_exists.vim
@@ -113,6 +113,13 @@ func Test_exists()
" Internal command with a count
call assert_equal(0, exists(':3buffer'))
+ " Valid internal command (full match)
+ call assert_equal(2, exists(':k'))
+ " Non-existing internal command (':k' with arg 'e')
+ call assert_equal(0, exists(':ke'))
+ " Valid internal command (partial match)
+ call assert_equal(1, exists(':kee'))
+
" User defined command (full match)
command! MyCmd :echo 'My command'
call assert_equal(2, exists(':MyCmd'))
diff --git a/src/version.c b/src/version.c
index 80e703359..fd67af638 100644
--- 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 */
+/**/
+ 748,
/**/
747,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1suvs3-00HYFD-Ac%40256bit.org.
