mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0574: ex: wrong handling of commands after bar

Browse Source 
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: vim/vim#15229

8c446da349

Co-authored-by: Mohamed Akram <mohd.akram@outlook.com>
This commit is contained in:
zeertzjq
2024-07-14 08:17:49 +08:00
parent 9093fbdd02
commit ba36742211
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/doc/insert.txt
View File

@@ -1927,6 +1927,16 @@ These two commands will keep on asking for lines, until you type a line
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".

6
src/nvim/ex_cmds.c
View File

@@ -2784,7 +2784,11 @@ void ex_append(exarg_T *eap)
indent = get_indent_lnum(lnum);
}
}
if (eap->ea_getline == NULL) {
if (*eap->arg == '|') {
// Get the text after the trailing bar.
theline = xstrdup(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.
if (eap->nextcmd == NULL || *eap->nextcmd == NUL) {

7
src/nvim/ex_docmd.c
View File

@@ -4108,7 +4108,12 @@ void separate_nextcmd(exarg_T *eap)
&& !(eap->argt & EX_NOTRLCOM)
&& (eap->cmdidx != CMD_at || p != eap->arg)
&& (eap->cmdidx != CMD_redir
|| p != eap->arg + 1 || p[-1] != '@')) || *p == '|' || *p == '\n') {
|| p != eap->arg + 1 || p[-1] != '@'))
|| (*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
// AND 'b' is present in 'cpoptions'.
if ((vim_strchr(p_cpo, CPO_BAR) == NULL

8
test/old/testdir/test_ex_mode.vim
View File

@@ -293,4 +293,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