Mercurial > vim
changeset 35671:3813def3dfd7 v9.1.0574
patch 9.1.0574: ex: wrong handling of commands after bar
Commit: https://github.com/vim/vim/commit/8c446da34998f6350911e07fbfd7932412c83185
Author: Mohamed Akram <mohd.akram@outlook.com>
Date: Sat Jul 13 18:49:55 2024 +0200
patch 9.1.0574: ex: wrong handling of commands after bar
Problem: ex: wrong handling of commands after bar
Solution: for :append, :insert and :change use the text after the bar
as input for those commands. This is what POSIX requests.
(Mohamed Akram)
See the POSIX Spec:
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ex.html#tag_20_40_13_03
Section 12.c
closes: #15229
Signed-off-by: Mohamed Akram <mohd.akram@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 17 Jul 2024 08:13:22 +0200 |
| parents | d49caa22b973 |
| children | 23b2cbcce5e2 |
| files | runtime/doc/insert.txt src/ex_cmds.c src/ex_docmd.c src/testdir/test_ex_mode.vim src/version.c |
| diffstat | 5 files changed, 33 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 9.1. Last change: 2024 Jul 12 +*insert.txt* For Vim version 9.1. Last change: 2024 Jul 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1995,6 +1995,16 @@ These two commands will keep on asking f containing only a ".". Watch out for lines starting with a backslash, see |line-continuation|. +Text typed after a "|" command separator is used first. So the following +command in ex mode: > + :a|one + two + . + :visual +<appends the following text, after the cursor line: > + one + two +< NOTE: These commands cannot be used with |:global| or |:vglobal|. ":append" and ":insert" don't work properly in between ":if" and ":endif", ":for" and ":endfor", ":while" and ":endwhile".
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3360,7 +3360,13 @@ ex_append(exarg_T *eap) indent = get_indent_lnum(lnum); } ex_keep_indent = FALSE; - if (eap->ea_getline == NULL) + if (*eap->arg == '|') + { + // Get the text after the trailing bar. + theline = vim_strsave(eap->arg + 1); + *eap->arg = NUL; + } + else if (eap->ea_getline == NULL) { // No getline() function, use the lines that follow. This ends // when there is no more.
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -5401,7 +5401,11 @@ separate_nextcmd(exarg_T *eap, int keep_ && in_vim9script() && !(eap->argt & EX_NOTRLCOM) && p > eap->cmd && VIM_ISWHITE(p[-1])) - || *p == '|' || *p == '\n') + || (*p == '|' + && eap->cmdidx != CMD_append + && eap->cmdidx != CMD_change + && eap->cmdidx != CMD_insert) + || *p == '\n') { /* * We remove the '\' before the '|', unless EX_CTRLV is used
--- a/src/testdir/test_ex_mode.vim +++ b/src/testdir/test_ex_mode.vim @@ -364,4 +364,12 @@ func Test_implicit_print() bw! endfunc +" Test inserting text after the trailing bar +func Test_insert_after_trailing_bar() + new + call feedkeys("Qi|\nfoo\n.\na|bar\nbar\n.\nc|baz\n.", "xt") + call assert_equal(['', 'foo', 'bar', 'baz'], getline(1, '$')) + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab