kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0573: ex: no implicit print for single addresses

Browse Source 
Problem:  ex: no implicit print for single addresses
Solution: explicitly print even during single addresses,
          as requested by POSIX (Mohamed Akram)

See the POSIX behaviour here:
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ex.html#tag_20_40_13_03
Section 6b

closes: vim/vim#15230

c25a7084e9

Co-authored-by: Mohamed Akram <mohd.akram@outlook.com>
This commit is contained in:
zeertzjq 2024-07-14 06:38:26 +08:00
parent 49ba36becd
commit 9093fbdd02
5 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/doc/motion.txt
View File

@ -342,6 +342,7 @@ gg Goto line [count], default first line, on the first
*:[range]*
:[range] Set the cursor on the last line number in [range].
In Ex mode, print the lines in [range].
[range] can also be just one line number, e.g., ":1"
or ":'m".
In contrast with |G| this command does not modify the

3
src/nvim/ex_docmd.c
View File

@ -2079,6 +2079,7 @@ static char *do_one_cmd(char **cmdlinep, int flags, cstack_T *cstack, LineGetter
if (ea.skip) { // skip this if inside :if
goto doend;
}
assert(errormsg == NULL);
errormsg = ex_range_without_command(&ea);
goto doend;
}
@ -2431,7 +2432,7 @@ static char *ex_range_without_command(exarg_T *eap)
{
char *errormsg = NULL;
if (*eap->cmd == '|' || (exmode_active && eap->line1 != eap->line2)) {
if (*eap->cmd == '|' || exmode_active) {
eap->cmdidx = CMD_print;
eap->argt = EX_RANGE | EX_COUNT | EX_TRLBAR;
if ((errormsg = invalid_range(eap)) == NULL) {

2
src/nvim/getchar.c
View File

@ -2729,7 +2729,7 @@ static int vgetorpeek(bool advance)
timedout = true;
continue;
}
// In Ex-mode \n is compatible with original Vim behaviour.
// For the command line only CTRL-C always breaks it.
// For the cmdline window: Alternate between ESC and
// CTRL-C: ESC for most situations and CTRL-C to close the

19
test/old/testdir/setup.vim
View File

@ -32,8 +32,8 @@ if exists('s:did_load')
endif
if g:testname !~ 'test_mapping.vim$'
" Make "Q" switch to Ex mode.
" This does not work for all tests.
nnoremap Q gQ
" This does not work for all tests as Nvim only supports Vim Ex mode.
nnoremap Q gQ<Cmd>call<SID>ExStart()<CR>
endif
endif
@ -45,6 +45,21 @@ if exists('s:did_load')
endif
let s:did_load = 1
func s:ExStart()
call feedkeys($"\<Cmd>call{expand('<SID>')}ExMayEnd()\<CR>")
endfunc
func s:ExMayEnd()
" When :normal runs out of characters in Vim, the behavior is different in
" normal Ex mode vs. Vim Ex mode.
" - In normal Ex mode, "\n" is used.
" - In Vim Ex mode, Ctrl-C is used.
" Nvim only supports Vim Ex mode, so emulate the normal Ex mode behavior.
if state('m') == '' && mode(1) == 'cv' && getcharstr(1) == "\<C-C>"
call feedkeys("\n")
endif
endfunc
" Clear Nvim default user commands, mappings and menus.
comclear
mapclear

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

@ -282,4 +282,15 @@ func Test_ex_mode_large_indent()
endfunc
" Testing implicit print command
func Test_implicit_print()
new
call setline(1, ['one', 'two', 'three'])
call feedkeys('Q:let a=execute(":1,2")', 'xt')
call feedkeys('Q:let b=execute(":3")', 'xt')
call assert_equal('one two', a->split('\n')->join(' '))
call assert_equal('three', b->split('\n')->join(' '))
bw!
endfunc
" vim: shiftwidth=2 sts=2 expandtab