Skip to content

Commit

Permalink
vim-patch:partial:8.2.3637: typos in test files (neovim#29172)
Browse files Browse the repository at this point in the history
Problem:    Typos in test files.
Solution:   Correct the typos. (Dominique Pellé, closes vim/vim#9175)

vim/vim@923dce2

Co-authored-by: Dominique Pelle <[email protected]>
  • Loading branch information
zeertzjq and dpelle authored Jun 3, 2024
1 parent 5aa9906 commit e20c5fb
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion test/old/testdir/runtest.vim
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ if has('win32')
endif

if has('mac')
" In MacOS, when starting a shell in a terminal, a bash deprecation warning
" In macOS, when starting a shell in a terminal, a bash deprecation warning
" message is displayed. This breaks the terminal test. Disable the warning
" message.
let $BASH_SILENCE_DEPRECATION_WARNING = 1
Expand Down
10 changes: 5 additions & 5 deletions test/old/testdir/test_debugger.vim
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ func Test_Backtrace_Through_Source()

call RunDbgCmd( buf, 'down', [ 'frame is zero' ] )

" step until we have another meaninfgul trace
" step until we have another meaningful trace
call RunDbgCmd(buf, 'step', ['line 5: func File2Function()'])
call RunDbgCmd(buf, 'step', ['line 9: call File2Function()'])
call RunDbgCmd(buf, 'backtrace', [
Expand Down Expand Up @@ -611,7 +611,7 @@ func Test_Backtrace_Autocmd()
\ ['cmd: doautocmd User TestGlobalFunction'])
call RunDbgCmd(buf, 'step', ['cmd: call GlobalFunction() | echo "Done"'])

" At this point the ontly thing in the stack is the autocommand
" At this point the only thing in the stack is the autocommand
call RunDbgCmd(buf, 'backtrace', [
\ '>backtrace',
\ '->0 User Autocommands for "TestGlobalFunction"',
Expand Down Expand Up @@ -741,7 +741,7 @@ func Test_Backtrace_Autocmd()

call RunDbgCmd( buf, 'down', [ 'frame is zero' ] )

" step until we have another meaninfgul trace
" step until we have another meaningful trace
call RunDbgCmd(buf, 'step', ['line 5: func File2Function()'])
call RunDbgCmd(buf, 'step', ['line 9: call File2Function()'])
call RunDbgCmd(buf, 'backtrace', [
Expand Down Expand Up @@ -867,7 +867,7 @@ func Test_Backtrace_CmdLine()
call CheckDbgOutput(buf, ['command line',
\ 'cmd: call GlobalFunction()'], #{msec: 5000})

" At this point the ontly thing in the stack is the cmdline
" At this point the only thing in the stack is the cmdline
call RunDbgCmd(buf, 'backtrace', [
\ '>backtrace',
\ '->0 command line',
Expand Down Expand Up @@ -1285,7 +1285,7 @@ func Test_debug_backtrace_level()
\ #{ match: 'pattern' } )

" Expression evaluation in the script frame (not the function frame)
" FIXME: Unexpected in this scope (a: should not be visibnle)
" FIXME: Unexpected in this scope (a: should not be visible)
call RunDbgCmd(buf, 'echo a:arg', [ 'arg1' ] )
call RunDbgCmd(buf, 'echo s:file1_var', [ 'file1' ] )
call RunDbgCmd(buf, 'echo g:global_var', [ 'global' ] )
Expand Down
4 changes: 2 additions & 2 deletions test/old/testdir/test_diffmode.vim
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func Test_diffget_diffput_empty_buffer()
endfunc

" :diffput and :diffget completes names of buffers which
" are in diff mode and which are different then current buffer.
" are in diff mode and which are different than current buffer.
" No completion when the current window is not in diff mode.
func Test_diffget_diffput_completion()
e Xdiff1 | diffthis
Expand Down Expand Up @@ -679,7 +679,7 @@ func Test_diffexpr()
call assert_notequal(normattr, screenattr(3, 1))
diffoff!

" Try using an non-existing function for 'diffexpr'.
" Try using a non-existing function for 'diffexpr'.
set diffexpr=NewDiffFunc()
call assert_fails('windo diffthis', ['E117:', 'E97:'])
diffoff!
Expand Down
2 changes: 1 addition & 1 deletion test/old/testdir/test_excmd.vim
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ func Sandbox_tests()
if has('clientserver')
call assert_fails('let s=remote_expr("gvim", "2+2")', 'E48:')
if !has('win32')
" remote_foreground() doesn't thrown an error message on MS-Windows
" remote_foreground() doesn't throw an error message on MS-Windows
call assert_fails('call remote_foreground("gvim")', 'E48:')
endif
call assert_fails('let s=remote_peek("gvim")', 'E48:')
Expand Down
2 changes: 1 addition & 1 deletion test/old/testdir/test_flatten.vim
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func Test_flatten()
call test_garbagecollect_now()
call assert_equal([1, 2, 3], l:list)

" Tests for checking circular reference list can be flatten.
" Tests for checking circular reference list can be flattened.
let l:x = [1]
let l:y = [x]
let l:z = flatten(l:y)
Expand Down
6 changes: 3 additions & 3 deletions test/old/testdir/test_normal.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1522,7 +1522,7 @@ func Test_normal18_z_fold()
norm! j
call assert_equal('52', getline('.'))

" zA on a opened fold when foldenable is not set
" zA on an opened fold when foldenable is not set
50
set nofoldenable
norm! zA
Expand Down Expand Up @@ -1878,7 +1878,7 @@ func Test_normal23_K()

let not_gnu_man = has('mac') || has('bsd')
if not_gnu_man
" In MacOS and BSD, the option for specifying a pager is different
" In macOS and BSD, the option for specifying a pager is different
set keywordprg=man\ -P\ cat
else
set keywordprg=man\ --pager=cat
Expand Down Expand Up @@ -2727,7 +2727,7 @@ func Test_normal33_g_cmd2()
call assert_equal('foo first line', getline(1))
set virtualedit&

" Test for aboring a g command using CTRL-\ CTRL-G
" Test for aborting a g command using CTRL-\ CTRL-G
exe "normal! g\<C-\>\<C-G>"
call assert_equal('foo first line', getline('.'))

Expand Down
2 changes: 1 addition & 1 deletion test/old/testdir/test_options.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1732,7 +1732,7 @@ func Test_cmdheight()
set cmdheight&
endfunc

" To specify a control character as a option value, '^' can be used
" To specify a control character as an option value, '^' can be used
func Test_opt_control_char()
set wildchar=^v
call assert_equal("\<C-V>", nr2char(&wildchar))
Expand Down
8 changes: 3 additions & 5 deletions test/old/testdir/test_quickfix.vim
Original file line number Diff line number Diff line change
Expand Up @@ -4353,11 +4353,9 @@ endfunc
" Test for shortening/simplifying the file name when opening the
" quickfix window or when displaying the quickfix list
func Test_shorten_fname()
if !has('unix')
return
endif
CheckUnix
%bwipe
" Create a quickfix list with a absolute path filename
" Create a quickfix list with an absolute path filename
let fname = getcwd() . '/test_quickfix.vim'
call setqflist([], ' ', {'lines':[fname . ":20:Line20"], 'efm':'%f:%l:%m'})
call assert_equal(fname, bufname('test_quickfix.vim'))
Expand All @@ -4366,7 +4364,7 @@ func Test_shorten_fname()
call assert_equal('test_quickfix.vim', bufname('test_quickfix.vim'))
cclose
%bwipe
" Create a quickfix list with a absolute path filename
" Create a quickfix list with an absolute path filename
call setqflist([], ' ', {'lines':[fname . ":20:Line20"], 'efm':'%f:%l:%m'})
call assert_equal(fname, bufname('test_quickfix.vim'))
" Displaying the quickfix list should simplify the file path
Expand Down
2 changes: 1 addition & 1 deletion test/old/testdir/test_spellfile.vim
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ func Test_aff_file_format_error()
let output = execute('mkspell! Xtest.spl Xtest')
call assert_match('Different combining flag in continued affix block in Xtest.aff line 3', output)

" Try to reuse a affix used for BAD flag
" Try to reuse an affix used for BAD flag
call writefile(['BAD x', 'PFX x Y 1', 'PFX x 0 re x'], 'Xtest.aff')
let output = execute('mkspell! Xtest.spl Xtest')
call assert_match('Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in Xtest.aff line 2: x', output)
Expand Down
3 changes: 1 addition & 2 deletions test/old/testdir/test_syntax.vim
Original file line number Diff line number Diff line change
Expand Up @@ -549,8 +549,7 @@ endfunc
func Test_bg_detection()
CheckNotGui

" auto-detection of &bg, make sure sure it isn't set anywhere before
" this test
" auto-detection of &bg, make sure it isn't set anywhere before this test
hi Normal ctermbg=0
call assert_equal('dark', &bg)
hi Normal ctermbg=4
Expand Down
2 changes: 1 addition & 1 deletion test/old/testdir/test_textobjects.vim
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func Test_empty_html_tag()
normal 0f<vitsaaa
call assert_equal('aaa', getline(1))

" selecting a tag block in an non-empty blank line should fail
" selecting a tag block in a non-empty blank line should fail
call setline(1, ' ')
call assert_beeps('normal $vaty')

Expand Down
2 changes: 1 addition & 1 deletion test/old/testdir/test_trycatch.vim
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func T25_F()
Xpath 'i'
endfunc

" Also try using "fina" and "final" and "finall" as abbraviations.
" Also try using "fina" and "final" and "finall" as abbreviations.
func T25_G()
if 1
try
Expand Down

0 comments on commit e20c5fb

Please sign in to comment.