mirror of
https://github.com/neovim/neovim.git
synced 2025-09-29 06:28:35 +00:00
vim-patch:8.2.0836: not all :cdo output is visible (#18007)
Problem: Not all :cdo output is visible.
Solution: Reset 'shortmess' temporarily. (Yegappan Lakshmanan, closes vim/vim#6155)
14798ab9a5
Cherry pick relevant changes form patches 8.1.1826 and 8.2.0557.
This commit is contained in:
@@ -1470,7 +1470,13 @@ void ex_listdo(exarg_T *eap)
|
|||||||
|
|
||||||
size_t qf_idx = qf_get_cur_idx(eap);
|
size_t qf_idx = qf_get_cur_idx(eap);
|
||||||
|
|
||||||
|
// Clear 'shm' to avoid that the file message overwrites
|
||||||
|
// any output from the command.
|
||||||
|
p_shm_save = vim_strsave(p_shm);
|
||||||
|
set_option_value("shm", 0L, "", 0);
|
||||||
ex_cnext(eap);
|
ex_cnext(eap);
|
||||||
|
set_option_value("shm", 0L, (char *)p_shm_save, 0);
|
||||||
|
xfree(p_shm_save);
|
||||||
|
|
||||||
// If jumping to the next quickfix entry fails, quit here.
|
// If jumping to the next quickfix entry fails, quit here.
|
||||||
if (qf_get_cur_idx(eap) == qf_idx) {
|
if (qf_get_cur_idx(eap) == qf_idx) {
|
||||||
|
@@ -1,30 +1,29 @@
|
|||||||
" Tests for the :cdo, :cfdo, :ldo and :lfdo commands
|
" Tests for the :cdo, :cfdo, :ldo and :lfdo commands
|
||||||
|
|
||||||
if !has('quickfix')
|
source check.vim
|
||||||
throw 'Skipped: quickfix feature missing'
|
CheckFeature quickfix
|
||||||
endif
|
|
||||||
|
|
||||||
" Create the files used by the tests
|
" Create the files used by the tests
|
||||||
function SetUp()
|
func SetUp()
|
||||||
call writefile(["Line1", "Line2", "Line3"], 'Xtestfile1')
|
call writefile(["Line1", "Line2", "Line3"], 'Xtestfile1')
|
||||||
call writefile(["Line1", "Line2", "Line3"], 'Xtestfile2')
|
call writefile(["Line1", "Line2", "Line3"], 'Xtestfile2')
|
||||||
call writefile(["Line1", "Line2", "Line3"], 'Xtestfile3')
|
call writefile(["Line1", "Line2", "Line3"], 'Xtestfile3')
|
||||||
endfunction
|
endfunc
|
||||||
|
|
||||||
" Remove the files used by the tests
|
" Remove the files used by the tests
|
||||||
function TearDown()
|
func TearDown()
|
||||||
call delete('Xtestfile1')
|
call delete('Xtestfile1')
|
||||||
call delete('Xtestfile2')
|
call delete('Xtestfile2')
|
||||||
call delete('Xtestfile3')
|
call delete('Xtestfile3')
|
||||||
endfunction
|
endfunc
|
||||||
|
|
||||||
" Returns the current line in '<filename> <linenum>L <column>C' format
|
" Returns the current line in '<filename> <linenum>L <column>C' format
|
||||||
function GetRuler()
|
func GetRuler()
|
||||||
return expand('%') . ' ' . line('.') . 'L' . ' ' . col('.') . 'C'
|
return expand('%') . ' ' . line('.') . 'L' . ' ' . col('.') . 'C'
|
||||||
endfunction
|
endfunc
|
||||||
|
|
||||||
" Tests for the :cdo and :ldo commands
|
" Tests for the :cdo and :ldo commands
|
||||||
function XdoTests(cchar)
|
func XdoTests(cchar)
|
||||||
enew
|
enew
|
||||||
|
|
||||||
" Shortcuts for calling the cdo and ldo commands
|
" Shortcuts for calling the cdo and ldo commands
|
||||||
@@ -133,10 +132,10 @@ function XdoTests(cchar)
|
|||||||
exe XdoCmd
|
exe XdoCmd
|
||||||
call assert_equal(['Xtestfile3 3L 1C'], l)
|
call assert_equal(['Xtestfile3 3L 1C'], l)
|
||||||
|
|
||||||
endfunction
|
endfunc
|
||||||
|
|
||||||
" Tests for the :cfdo and :lfdo commands
|
" Tests for the :cfdo and :lfdo commands
|
||||||
function XfdoTests(cchar)
|
func XfdoTests(cchar)
|
||||||
enew
|
enew
|
||||||
|
|
||||||
" Shortcuts for calling the cfdo and lfdo commands
|
" Shortcuts for calling the cfdo and lfdo commands
|
||||||
@@ -190,16 +189,28 @@ function XfdoTests(cchar)
|
|||||||
exe XfdoCmd
|
exe XfdoCmd
|
||||||
call assert_equal(['Xtestfile2 2L 5C'], l)
|
call assert_equal(['Xtestfile2 2L 5C'], l)
|
||||||
|
|
||||||
endfunction
|
endfunc
|
||||||
|
|
||||||
" Tests for cdo and cfdo
|
" Tests for cdo and cfdo
|
||||||
function Test_cdo()
|
func Test_cdo()
|
||||||
call XdoTests('c')
|
call XdoTests('c')
|
||||||
call XfdoTests('c')
|
call XfdoTests('c')
|
||||||
endfunction
|
endfunc
|
||||||
|
|
||||||
" Tests for ldo and lfdo
|
" Tests for ldo and lfdo
|
||||||
function Test_ldo()
|
func Test_ldo()
|
||||||
call XdoTests('l')
|
call XdoTests('l')
|
||||||
call XfdoTests('l')
|
call XfdoTests('l')
|
||||||
endfunction
|
endfunc
|
||||||
|
|
||||||
|
" Test for making 'shm' doesn't interfere with the output.
|
||||||
|
func Test_cdo_print()
|
||||||
|
enew | only!
|
||||||
|
cgetexpr ["Xtestfile1:1:Line1", "Xtestfile2:1:Line1", "Xtestfile3:1:Line1"]
|
||||||
|
cdo print
|
||||||
|
call assert_equal('Line1', Screenline(&lines))
|
||||||
|
call assert_equal('Line1', Screenline(&lines - 3))
|
||||||
|
call assert_equal('Line1', Screenline(&lines - 6))
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
Reference in New Issue
Block a user