mirror of
https://github.com/neovim/neovim.git
synced 2026-03-31 12:52:13 +00:00
vim-patch:9.2.0270: test: trailing spaces used in tests
Problem: test: trailing spaces used in tests
Solution: Rewrite tests to avoid trailing spaces (Paul Ollis).
Some tests currently rely on trailing whitespace at the end of lines,
escaped with '\'. I have demonstrated in another PR, such spaces can be
inadvertently removed and this is difficult to spot.
Note: there are more trailing spaces in a few more test files, see
testdir/test_codestyle.vim. Those are not yet removed.
closes: vim/vim#19838
211ceea602
Co-authored-by: Paul Ollis <paul@cleversheep.org>
This commit is contained in:
@@ -393,7 +393,7 @@ describe('Conceal', function()
|
||||
\ "three |hidden| three three three three three three three three"]
|
||||
call setline(1, lines)
|
||||
set wrap linebreak
|
||||
set showbreak=\ >>>\
|
||||
let &showbreak = ' >>> '
|
||||
syntax match test /|hidden|/ conceal
|
||||
set conceallevel=2
|
||||
set concealcursor=
|
||||
|
||||
@@ -148,7 +148,7 @@ func Test_conceal_with_cursorcolumn()
|
||||
\ "three |hidden| three three three three three three three three"]
|
||||
call setline(1, lines)
|
||||
set wrap linebreak
|
||||
set showbreak=\ >>>\
|
||||
let &showbreak = ' >>> '
|
||||
syntax match test /|hidden|/ conceal
|
||||
set conceallevel=2
|
||||
set concealcursor=
|
||||
|
||||
@@ -345,7 +345,7 @@ func Test_eob_fillchars()
|
||||
set fillchars=eob:+
|
||||
redraw
|
||||
call assert_equal('+', Screenline(2))
|
||||
set fillchars=eob:\
|
||||
let &fillchars = 'eob: '
|
||||
redraw
|
||||
call assert_equal(' ', nr2char(screenchar(2, 1)))
|
||||
set fillchars&
|
||||
@@ -416,7 +416,7 @@ func Test_fold_fillchars()
|
||||
call assert_equal(expected, lines)
|
||||
|
||||
" check setting foldinner
|
||||
set fillchars+=foldinner:\
|
||||
let &fillchars = &fillchars .. ',foldinner: '
|
||||
let lines = ScreenLines([1, 6], 22)
|
||||
let expected = [
|
||||
\ ' one ',
|
||||
|
||||
@@ -3421,7 +3421,9 @@ endfunc
|
||||
func Test_ins_complete_end_of_line()
|
||||
" this was reading past the end of the line
|
||||
new
|
||||
norm 8oý
|
||||
" Note that the 'space' at the end of the expression below is a non-breaking
|
||||
" space, U+00a0.
|
||||
execute "norm 8oý "
|
||||
sil! norm o
|
||||
|
||||
bwipe!
|
||||
|
||||
@@ -422,7 +422,7 @@ func Test_listchars()
|
||||
|
||||
" Test leadtab with pipe character
|
||||
normal ggdG
|
||||
set listchars=tab:>-,leadtab:\|\
|
||||
let &listchars = 'tab:>-,leadtab:| '
|
||||
call append(0, ["\ttext"])
|
||||
let expected = ['| text']
|
||||
call Check_listchars(expected, 1, 12)
|
||||
@@ -430,7 +430,7 @@ func Test_listchars()
|
||||
|
||||
" Test leadtab with unicode bar
|
||||
normal ggdG
|
||||
set listchars=tab:>-,leadtab:│\
|
||||
let &listchars = 'tab:>-,leadtab:│ '
|
||||
call append(0, ["\ttext"])
|
||||
let expected = ['│ text']
|
||||
call Check_listchars(expected, 1, 12)
|
||||
|
||||
@@ -4447,6 +4447,7 @@ endfunc
|
||||
"
|
||||
" The problem occurred because WM_SETFOCUS was processed slowly, and typebuf
|
||||
" was not empty when it should have been.
|
||||
" TODO: Is this test flaky?
|
||||
func Test_win32_gui_setfocus_prevent_showcmd()
|
||||
if !has('win32') || !has('gui_running')
|
||||
throw 'Skipped: Windows GUI regression test'
|
||||
|
||||
@@ -518,7 +518,8 @@ func Test_smoothscroll_long_line_showbreak()
|
||||
vim9script
|
||||
# a line that spans four screen lines
|
||||
setline(1, 'with lots of text in one line '->repeat(6))
|
||||
set smoothscroll scrolloff=0 showbreak=+++\
|
||||
set smoothscroll scrolloff=0
|
||||
&showbreak = '+++ '
|
||||
END
|
||||
call writefile(lines, 'XSmoothLongShowbreak', 'D')
|
||||
let buf = RunVimInTerminal('-S XSmoothLongShowbreak', #{rows: 6, cols: 40})
|
||||
|
||||
@@ -167,7 +167,9 @@ func Test_sign()
|
||||
|
||||
sign define Sign5 text=X\ linehl=Comment
|
||||
sign undefine Sign5
|
||||
sign define Sign5 linehl=Comment text=X\
|
||||
" The use of execute in the next line is just to ensure the space for
|
||||
" the text value is obvious and does not get accidently deleted.
|
||||
execute "sign define Sign5 linehl=Comment text=X\ "
|
||||
sign undefine Sign5
|
||||
|
||||
" define sign with backslash
|
||||
|
||||
Reference in New Issue
Block a user