patch 9.1.1708: tests: various tests can be improved
Commit:
https://github.com/vim/vim/commit/97ea879b9bd80baf2a64378eedc06a9610105dad
Author: Yegappan Lakshmanan <[email protected]>
Date: Fri Aug 29 18:04:26 2025 +0200
patch 9.1.1708: tests: various tests can be improved
Problem: tests: various tests can be improved
Solution: Use string interpolation to concatenate strings in
test_winfixbuf, check for specific errors in assert_fails()
(Yegappan Lakshmanan)
closes: #18151
Signed-off-by: Yegappan Lakshmanan <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index 4a96c3070..a652357a0 100644
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -398,16 +398,16 @@ func Test_crypt_set_key_changes_buffer()
call assert_fails(":q", "E37:")
w
set key=anotherkey
- call assert_fails(":bw")
+ call assert_fails(":bw", 'E89: No write since last change for buffer')
w
call feedkeys(":X\<CR>foobar\<CR>foobar\<CR>", 'xt')
- call assert_fails(":bw")
+ call assert_fails(":bw", 'E89: No write since last change for buffer')
w
let winnr = winnr()
wincmd p
call setwinvar(winnr, '&key', 'yetanotherkey')
wincmd p
- call assert_fails(":bw")
+ call assert_fails(":bw", 'E89: No write since last change for buffer')
w
set cryptmethod&
diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index ec44d8092..0bdc52f54 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -21,7 +21,7 @@ func Test_equal()
call assert_false(base.method == instance.other)
call assert_false([base.method] == [instance.other])
- call assert_fails('echo base.method > instance.method')
+ call assert_fails('echo base.method > instance.method', 'E694: Invalid
operation for Funcrefs')
call assert_equal(0, test_null_function() == function('min'))
call assert_equal(1, test_null_function() == test_null_function())
call assert_fails('eval 10 == test_unknown()', ['E340:', 'E685:'])
diff --git a/src/testdir/test_file_perm.vim b/src/testdir/test_file_perm.vim
index 8af95328a..69e0e6916 100644
--- a/src/testdir/test_file_perm.vim
+++ b/src/testdir/test_file_perm.vim
@@ -17,7 +17,7 @@ func Test_file_perm()
call assert_equal(1, setfperm('XtestPerm', 'r--r--r--'))
call assert_equal('r--r--r--', getfperm('XtestPerm'))
- call assert_fails("setfperm('XtestPerm', '---')")
+ call assert_fails("call setfperm('XtestPerm', '---')", 'E475: Invalid
argument: ---')
call assert_equal(1, setfperm('XtestPerm', 'rwx------'))
diff --git a/src/testdir/test_hide.vim b/src/testdir/test_hide.vim
index b3ce39552..379d2e3e3 100644
--- a/src/testdir/test_hide.vim
+++ b/src/testdir/test_hide.vim
@@ -21,7 +21,7 @@ function Test_hide()
new Xf1
set modified
- call assert_fails('edit Xf2')
+ call assert_fails('edit Xf2', 'E37: No write since last change (add ! to
override)')
bwipeout! Xf1
new Xf1
diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 5ce4f1ede..0c9eaebb1 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -1085,7 +1085,7 @@ func Test_colornames_assignment_and_unassignment()
let v:colornames['x1'] = '#111111'
call assert_equal(v:colornames['x1'], '#111111')
unlet v:colornames['x1']
- call assert_fails("echo v:colornames['x1']")
+ call assert_fails("echo v:colornames['x1']", 'E716: Key not present in
Dictionary: "x1"')
endfunc
" Test for the hlget() function
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index c4d8fd7ee..9dbd0094e 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -1219,7 +1219,7 @@ func Test_mkvimrc()
set pastetoggle=<F5>
set wildchar=<F6>
set wildcharm=<F7>
- call assert_fails('mkvimrc Xtestvimrc')
+ call assert_fails('mkvimrc Xtestvimrc', 'E189: "Xtestvimrc" exists')
mkvimrc! Xtestvimrc
call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set
pastetoggle=<F5>'))
call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set wildchar=<F6>'))
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index b17f823e7..9fe790c4e 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -171,7 +171,7 @@ func Test_signcolumn()
call assert_equal("auto", &signcolumn)
set signcolumn=yes
set signcolumn=no
- call assert_fails('set signcolumn=nope')
+ call assert_fails('set signcolumn=nope', 'E474: Invalid argument:
signcolumn=nope')
endfunc
func Test_filetype_valid()
diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index a68321f90..c69cf09bf 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -218,7 +218,7 @@ func Test_undo_del_chars()
call BackOne('3-456')
call BackOne('23-456')
call BackOne('123-456')
- call assert_fails("BackOne('123-456')")
+ call assert_fails("BackOne('123-456')", "E492: Not an editor command:
BackOne('123-456')")
:" Delete three other characters and go back in time with g-
call feedkeys('$x', 'xt')
@@ -234,7 +234,7 @@ func Test_undo_del_chars()
call BackOne('3-456')
call BackOne('23-456')
call BackOne('123-456')
- call assert_fails("BackOne('123-456')")
+ call assert_fails("BackOne('123-456')", "E492: Not an editor command:
BackOne('123-456')")
normal 10g+
call assert_equal('123-', getline(1))
diff --git a/src/testdir/test_vartabs.vim b/src/testdir/test_vartabs.vim
index 28b95ab69..49600fa53 100644
--- a/src/testdir/test_vartabs.vim
+++ b/src/testdir/test_vartabs.vim
@@ -382,14 +382,14 @@ func Test_vartabs_shiftwidth()
endfunc
func Test_vartabs_failures()
- call assert_fails('set vts=8,')
- call assert_fails('set vsts=8,')
- call assert_fails('set vts=8,,8')
- call assert_fails('set vsts=8,,8')
- call assert_fails('set vts=8,,8,')
- call assert_fails('set vsts=8,,8,')
- call assert_fails('set vts=,8')
- call assert_fails('set vsts=,8')
+ call assert_fails('set vts=8,', 'E475: Invalid argument: 8,')
+ call assert_fails('set vsts=8,', 'E475: Invalid argument: 8,')
+ call assert_fails('set vts=8,,8', 'E474: Invalid argument: vts=8,,8')
+ call assert_fails('set vsts=8,,8', 'E474: Invalid argument: vsts=8,,8')
+ call assert_fails('set vts=8,,8,', 'E474: Invalid argument: vts=8,,8,')
+ call assert_fails('set vsts=8,,8,', 'E474: Invalid argument: vsts=8,,8,')
+ call assert_fails('set vts=,8', 'E474: Invalid argument: vts=,8')
+ call assert_fails('set vsts=,8', 'E474: Invalid argument: vsts=,8')
endfunc
func Test_vartabs_reset()
diff --git a/src/testdir/test_winfixbuf.vim b/src/testdir/test_winfixbuf.vim
index a553799d3..898443d9b 100644
--- a/src/testdir/test_winfixbuf.vim
+++ b/src/testdir/test_winfixbuf.vim
@@ -74,7 +74,7 @@ func s:make_buffer_trio()
edit! third
let l:third = bufnr()
- execute ":buffer! " . l:second
+ exe $":buffer! {l:second}"
return [l:first, l:second, l:third]
endfunc
@@ -177,11 +177,11 @@ endfunc
" Create a quickfix with at least 2 entries that are in the current
'winfixbuf' window.
func s:make_quickfix_windows()
let [l:current, _] = s:make_simple_quickfix()
- execute "buffer! " . l:current
+ exe $"buffer! {l:current}"
split
let l:first_window = win_getid()
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
let l:winfix_window = win_getid()
" Open the quickfix in a separate split and go to it
@@ -207,7 +207,7 @@ func s:set_quickfix_by_buffer(buffer)
let l:index = 1 " quickfix indices start at 1
for l:entry in getqflist()
if l:entry["bufnr"] == a:buffer
- execute l:index . "cc"
+ exe $"{l:index} cc"
return
endif
@@ -215,7 +215,7 @@ func s:set_quickfix_by_buffer(buffer)
let l:index += 1
endfor
- echoerr 'No quickfix entry matching "' . a:buffer . '" could be found.'
+ echoerr $'No quickfix entry matching {a:buffer} could be found.'
endfunc
" Fail to call :Next on a 'winfixbuf' window unless :Next! is used.
@@ -250,7 +250,7 @@ func Test_argdo_choose_available_window()
split
let l:nowinfixbuf_window = win_getid()
" Move to the 'winfixbuf' window now
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
let l:winfixbuf_window = win_getid()
let l:expected_windows = s:get_windows_count()
@@ -271,7 +271,7 @@ func Test_argdo_make_new_window()
argdo echo ''
call assert_notequal(l:current, win_getid())
call assert_equal(l:last, bufnr())
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
call assert_equal(l:first, bufnr())
call assert_equal(l:current_windows + 1, s:get_windows_count())
endfunc
@@ -310,7 +310,7 @@ func Test_arglocal()
let l:other = s:make_buffer_pairs()
let l:current = bufnr()
argglobal! other
- execute "buffer! " . l:current
+ exe $"buffer! {l:current}"
call assert_fails("arglocal other", "E1513:")
call assert_equal(l:current, bufnr())
@@ -419,9 +419,9 @@ func Test_bmodified()
let l:other = s:make_buffer_pairs()
let l:current = bufnr()
- execute "buffer! " . l:other
+ exe $"buffer! {l:other}"
set modified
- execute "buffer! " . l:current
+ exe $"buffer! {l:current}"
call assert_fails("bmodified", "E1513:")
call assert_equal(l:current, bufnr())
@@ -532,7 +532,7 @@ func Test_bufdo_choose_available_window()
split
let l:nowinfixbuf_window = win_getid()
" Move to the 'winfixbuf' window now
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
let l:winfixbuf_window = win_getid()
let l:current = bufnr()
@@ -551,14 +551,14 @@ func Test_bufdo_make_new_window()
call s:reset_all_buffers()
let [l:first, l:last] = s:make_buffers_list()
- execute "buffer! " . l:first
+ exe $"buffer! {l:first}"
let l:current = win_getid()
let l:current_windows = s:get_windows_count()
bufdo echo ''
call assert_notequal(l:current, win_getid())
call assert_equal(l:last, bufnr())
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
call assert_equal(l:first, bufnr())
call assert_equal(l:current_windows + 1, s:get_windows_count())
endfunc
@@ -570,10 +570,10 @@ func Test_buffer()
let l:other = s:make_buffer_pairs()
let l:current = bufnr()
- call assert_fails("buffer " . l:other, "E1513:")
+ call assert_fails($"buffer {l:other}", "E1513:")
call assert_equal(l:current, bufnr())
- execute "buffer! " . l:other
+ exe $"buffer! {l:other}"
call assert_equal(l:other, bufnr())
endfunc
@@ -584,10 +584,10 @@ func Test_buffer_same_buffer()
call s:make_buffer_pairs()
let l:current = bufnr()
- execute "buffer " . l:current
+ exe $"buffer {l:current}"
call assert_equal(l:current, bufnr())
- execute "buffer! " . l:current
+ exe $"buffer! {l:current}"
call assert_equal(l:current, bufnr())
endfunc
@@ -637,7 +637,7 @@ func Test_caddexpr()
let l:file_path = tempname()
call writefile(["Error - bad-thing-found"], l:file_path, 'D')
- execute "edit " . l:file_path
+ exe $"edit {l:file_path}"
let l:file_buffer = bufnr()
let l:current = bufnr()
@@ -648,9 +648,9 @@ func Test_caddexpr()
set winfixbuf
- execute "buffer! " . l:file_buffer
+ exe $"buffer! {l:file_buffer}"
- execute 'caddexpr expand("%") .. ":" .. line(".") .. ":" .. getline(".")'
+ exe 'caddexpr expand("%") .. ":" .. line(".") .. ":" .. getline(".")'
call assert_equal(l:current, bufnr())
endfunc
@@ -661,7 +661,7 @@ func Test_cbuffer()
let l:file_path = tempname()
call writefile(["first.unittest:1:Error - bad-thing-found"], l:file_path,
'D')
- execute "edit " . l:file_path
+ exe $"edit {l:file_path}"
let l:file_buffer = bufnr()
let l:current = bufnr()
@@ -672,12 +672,12 @@ func Test_cbuffer()
set winfixbuf
- execute "buffer! " . l:file_buffer
+ exe $"buffer! {file_buffer}"
- call assert_fails("cbuffer " . l:file_buffer)
- call assert_equal(l:current, bufnr())
+ call assert_fails($"cbuffer {file_buffer}", "E1513: Cannot switch buffer.
'winfixbuf' is enabled")
+ call assert_equal(current, bufnr())
- execute "cbuffer! " . l:file_buffer
+ exe $"cbuffer! {file_buffer}"
call assert_equal("first.unittest", expand("%:t"))
endfunc
@@ -712,7 +712,7 @@ func Test_cdo_choose_available_window()
call s:reset_all_buffers()
let [l:current, l:last] = s:make_simple_quickfix()
- execute "buffer! " . l:current
+ exe $"buffer! {l:current}"
" Make a split window that is 'nowinfixbuf' but make it the second-to-last
" window so that :cdo will first try the 'winfixbuf' window, pass over it,
@@ -726,7 +726,7 @@ func Test_cdo_choose_available_window()
split
let l:nowinfixbuf_window = win_getid()
" Move to the 'winfixbuf' window now
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
let l:winfixbuf_window = win_getid()
let l:expected_windows = s:get_windows_count()
@@ -734,7 +734,7 @@ func Test_cdo_choose_available_window()
call assert_equal(l:nowinfixbuf_window, win_getid())
call assert_equal(l:last, bufnr())
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
call assert_equal(l:current, bufnr())
call assert_equal(l:expected_windows, s:get_windows_count())
endfunc
@@ -745,7 +745,7 @@ func Test_cdo_make_new_window()
call s:reset_all_buffers()
let [l:current_buffer, l:last] = s:make_simple_quickfix()
- execute "buffer! " . l:current_buffer
+ exe $"buffer! {l:current_buffer}"
let l:current_window = win_getid()
let l:current_windows = s:get_windows_count()
@@ -753,7 +753,7 @@ func Test_cdo_make_new_window()
cdo echo ''
call assert_notequal(l:current_window, win_getid())
call assert_equal(l:last, bufnr())
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
call assert_equal(l:current_buffer, bufnr())
call assert_equal(l:current_windows + 1, s:get_windows_count())
endfunc
@@ -763,17 +763,17 @@ func Test_cexpr()
CheckFeature quickfix
call s:reset_all_buffers()
- let l:file = tempname()
- let l:entry = '["' . l:file . ':1:bar"]'
- let l:current = bufnr()
+ let file = tempname()
+ let entry = $'["{file}:1:bar"]'
+ let current = bufnr()
set winfixbuf
- call assert_fails("cexpr " . l:entry)
- call assert_equal(l:current, bufnr())
+ call assert_fails($"cexpr {entry}", "E1513: Cannot switch buffer.
'winfixbuf' is enabled")
+ call assert_equal(current, bufnr())
- execute "cexpr! " . l:entry
- call assert_equal(fnamemodify(l:file, ":t"), expand("%:t"))
+ exe $"cexpr! {entry}"
+ call assert_equal(fnamemodify(file, ":t"), expand("%:t"))
endfunc
" Call :cfdo and choose the next available 'nowinfixbuf' window.
@@ -782,7 +782,7 @@ func Test_cfdo_choose_available_window()
call s:reset_all_buffers()
let [l:current, l:last] = s:make_simple_quickfix()
- execute "buffer! " . l:current
+ exe $"buffer! {l:current}"
" Make a split window that is 'nowinfixbuf' but make it the second-to-last
" window so that :cfdo will first try the 'winfixbuf' window, pass over it,
@@ -796,7 +796,7 @@ func Test_cfdo_choose_available_window()
split
let l:nowinfixbuf_window = win_getid()
" Move to the 'winfixbuf' window now
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
let l:winfixbuf_window = win_getid()
let l:expected_windows = s:get_windows_count()
@@ -804,7 +804,7 @@ func Test_cfdo_choose_available_window()
call assert_equal(l:nowinfixbuf_window, win_getid())
call assert_equal(l:last, bufnr())
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
call assert_equal(l:current, bufnr())
call assert_equal(l:expected_windows, s:get_windows_count())
endfunc
@@ -815,7 +815,7 @@ func Test_cfdo_make_new_window()
call s:reset_all_buffers()
let [l:current_buffer, l:last] = s:make_simple_quickfix()
- execute "buffer! " . l:current_buffer
+ exe $"buffer! {l:current_buffer}"
let l:current_window = win_getid()
let l:current_windows = s:get_windows_count()
@@ -823,7 +823,7 @@ func Test_cfdo_make_new_window()
cfdo echo ''
call assert_notequal(l:current_window, win_getid())
call assert_equal(l:last, bufnr())
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
call assert_equal(l:current_buffer, bufnr())
call assert_equal(l:current_windows + 1, s:get_windows_count())
endfunc
@@ -836,26 +836,26 @@ func Test_cfile()
edit first.unittest
call append(0, ["some-search-term bad-thing-found"])
write
- let l:first = bufnr()
+ let first = bufnr()
edit! second.unittest
call append(0, ["some-search-term"])
write
- let l:file = tempname()
- call writefile(["first.unittest:1:Error - bad-thing-found was detected"],
l:file)
+ let file = tempname()
+ call writefile(["first.unittest:1:Error - bad-thing-found was detected"],
file)
- let l:current = bufnr()
+ let current = bufnr()
set winfixbuf
- call assert_fails(":cfile " . l:file)
- call assert_equal(l:current, bufnr())
+ call assert_fails($":cfile {file}", "E1513: Cannot switch buffer.
'winfixbuf' is enabled")
+ call assert_equal(current, bufnr())
- execute ":cfile! " . l:file
- call assert_equal(l:first, bufnr())
+ exe $":cfile! {file}"
+ call assert_equal(first, bufnr())
- call delete(l:file)
+ call delete(file)
call delete("first.unittest")
call delete("second.unittest")
endfunc
@@ -929,7 +929,7 @@ func Test_cnext_no_previous_window()
call s:reset_all_buffers()
let [l:current, _] = s:make_simple_quickfix()
- execute "buffer! " . l:current
+ exe $"buffer! {l:current}"
let l:expected = s:get_windows_count()
@@ -1055,7 +1055,7 @@ func Test_ctrl_w_f()
call setline(1, l:file_name)
let l:current_windows = s:get_windows_count()
- execute "normal \<C-w>f"
+ exe "normal \<C-w>f"
call assert_equal(l:current_windows + 1, s:get_windows_count())
@@ -1066,9 +1066,9 @@ endfunc
func Test_djump()
call s:reset_all_buffers()
- let l:include_file = tempname() . ".h"
+ let l:include_file = tempname() .. ".h"
call writefile(["min(1, 12);",
- \ '#include "' . l:include_file . '"'
+ \ $'#include "{l:include_file}"'
\ ],
\ "main.c")
call writefile(["#define min(X, Y) ((X) < (Y) ? (X) : (Y))"],
l:include_file)
@@ -1132,23 +1132,23 @@ func
Test_edit_different_buffer_on_disk_and_relative_path_to_disk()
let l:file_on_disk = tempname()
let l:directory_on_disk1 = fnamemodify(l:file_on_disk, ":p:h")
let l:name = fnamemodify(l:file_on_disk, ":t")
- execute "edit " . l:file_on_disk
+ exe $"edit {l:file_on_disk}"
write!
- let l:directory_on_disk2 = l:directory_on_disk1 . "_something_else"
+ let l:directory_on_disk2 = l:directory_on_disk1 .. "_something_else"
if !isdirectory(l:directory_on_disk2)
call mkdir(l:directory_on_disk2)
endif
- execute "cd " . l:directory_on_disk2
- execute "edit " l:name
+ exe $"cd {l:directory_on_disk2}"
+ exe $"edit {l:name}"
let l:current = bufnr()
call assert_equal(l:current, bufnr())
set winfixbuf
- call assert_fails("edit " . l:file_on_disk, "E1513:")
+ call assert_fails($"edit {l:file_on_disk}", "E1513:")
call assert_equal(l:current, bufnr())
call delete(l:directory_on_disk1)
@@ -1171,26 +1171,26 @@ func
Test_edit_different_buffer_on_disk_and_relative_path_to_memory()
let l:file_on_disk = tempname()
let l:directory_on_disk1 = fnamemodify(l:file_on_disk, ":p:h")
let l:name = fnamemodify(l:file_on_disk, ":t")
- execute "edit " . l:file_on_disk
+ exe $"edit {l:file_on_disk}"
write!
- let l:directory_on_disk2 = l:directory_on_disk1 . "_something_else"
+ let l:directory_on_disk2 = l:directory_on_disk1 .. "_something_else"
if !isdirectory(l:directory_on_disk2)
call mkdir(l:directory_on_disk2)
endif
- execute "cd " . l:directory_on_disk2
- execute "edit " l:name
- execute "cd " . l:directory_on_disk1
- execute "edit " l:file_on_disk
- execute "cd " . l:directory_on_disk2
+ exe $"cd {l:directory_on_disk2}"
+ exe $"edit {l:name}"
+ exe $"cd {l:directory_on_disk1}"
+ exe $"edit {l:file_on_disk}"
+ exe $"cd {l:directory_on_disk2}"
let l:current = bufnr()
call assert_equal(l:current, bufnr())
set winfixbuf
- call assert_fails("edit " . l:name, "E1513:")
+ call assert_fails($"edit {l:name}", "E1513:")
call assert_equal(l:current, bufnr())
call delete(l:directory_on_disk1)
@@ -1249,12 +1249,12 @@ func Test_edit_same_buffer_on_disk_absolute_path()
call writefile([], file, 'D')
let file = fnamemodify(file, ':p')
let current = bufnr()
- execute "edit " . file
+ exe $"edit {file}"
write!
call assert_equal(current, bufnr())
set winfixbuf
- execute "edit " file
+ exe $"edit {file}"
call assert_equal(current, bufnr())
set nowinfixbuf
@@ -1301,17 +1301,17 @@ func Test_find()
let l:name = fnamemodify(l:file, ":p:t")
let l:original_path = &path
- execute "set path=" . l:directory
+ exe $"set path={l:directory}"
set winfixbuf
- call assert_fails("execute 'find " . l:name . "'", "E1513:")
+ call assert_fails($"exe 'find {l:name}'", "E1513:")
call assert_equal(l:current, bufnr())
- execute "find! " . l:name
+ exe $"find! {l:name}"
call assert_equal(l:file, expand("%:p"))
- execute "set path=" . l:original_path
+ exe $"set path={l:original_path}"
endfunc
" Fail :first but :first! is allowed
@@ -1354,7 +1354,7 @@ func Test_grep()
call assert_fails("silent! grep some-search-term *.unittest", "E1513:")
call assert_equal(l:current, bufnr())
- execute "edit! " . l:first
+ exe $"edit! {l:first}"
silent! grep! some-search-term *.unittest
call assert_notequal(l:first, bufnr())
@@ -1368,9 +1368,9 @@ endfunc
func Test_ijump()
call s:reset_all_buffers()
- let l:include_file = tempname() . ".h"
+ let l:include_file = tempname() .. ".h"
call writefile([
- \ '#include "' . l:include_file . '"'
+ \ $'#include "{l:include_file}"'
\ ],
\ "main.c", 'D')
call writefile(["#define min(X, Y) ((X) < (Y) ? (X) : (Y))"],
l:include_file, 'D')
@@ -1460,7 +1460,7 @@ func Test_laddexpr()
let l:file_path = tempname()
call writefile(["Error - bad-thing-found"], l:file_path, 'D')
- execute "edit " . l:file_path
+ exe $"edit {l:file_path}"
let l:file_buffer = bufnr()
let l:current = bufnr()
@@ -1471,9 +1471,9 @@ func Test_laddexpr()
set winfixbuf
- execute "buffer! " . l:file_buffer
+ exe $"buffer! {l:file_buffer}"
- execute 'laddexpr expand("%") .. ":" .. line(".") .. ":" .. getline(".")'
+ exe 'laddexpr expand("%") .. ":" .. line(".") .. ":" .. getline(".")'
call assert_equal(l:current, bufnr())
endfunc
@@ -1498,7 +1498,7 @@ func Test_lbuffer()
let l:file_path = tempname()
call writefile(["first.unittest:1:Error - bad-thing-found"], l:file_path,
'D')
- execute "edit " . l:file_path
+ exe $"edit {l:file_path}"
let l:file_buffer = bufnr()
let l:current = bufnr()
@@ -1509,12 +1509,12 @@ func Test_lbuffer()
set winfixbuf
- execute "buffer! " . l:file_buffer
+ exe $"buffer! {file_buffer}"
- call assert_fails("lbuffer " . l:file_buffer)
- call assert_equal(l:current, bufnr())
+ call assert_fails($"lbuffer {file_buffer}", "E1513: Cannot switch buffer.
'winfixbuf' is enabled")
+ call assert_equal(current, bufnr())
- execute "lbuffer! " . l:file_buffer
+ exe $"lbuffer! {file_buffer}"
call assert_equal("first.unittest", expand("%:t"))
endfunc
@@ -1526,9 +1526,9 @@ func Test_ldo()
let [l:first, l:middle, l:last] = s:make_simple_location_list()
lnext!
- call assert_fails('execute "ldo buffer ' . l:first . '"', "E1513:")
+ call assert_fails($'exe "ldo buffer {l:first}"', "E1513:")
call assert_equal(l:middle, bufnr())
- execute "ldo! buffer " . l:first
+ exe $"ldo! buffer {l:first}"
call assert_notequal(l:last, bufnr())
endfunc
@@ -1537,17 +1537,17 @@ func Test_lexpr()
CheckFeature quickfix
call s:reset_all_buffers()
- let l:file = tempname()
- let l:entry = '["' . l:file . ':1:bar"]'
- let l:current = bufnr()
+ let file = tempname()
+ let entry = $'["{file}:1:bar"]'
+ let current = bufnr()
set winfixbuf
- call assert_fails("lexpr " . l:entry)
- call assert_equal(l:current, bufnr())
+ call assert_fails($"lexpr {entry}", "E1513: Cannot switch buffer.
'winfixbuf' is enabled")
+ call assert_equal(current, bufnr())
- execute "lexpr! " . l:entry
- call assert_equal(fnamemodify(l:file, ":t"), expand("%:t"))
+ exe $"lexpr! {entry}"
+ call assert_equal(fnamemodify(file, ":t"), expand("%:t"))
endfunc
" Fail :lfdo but :lfdo! is allowed
@@ -1555,13 +1555,13 @@ func Test_lfdo()
CheckFeature quickfix
call s:reset_all_buffers()
- let [l:first, l:middle, l:last] = s:make_simple_location_list()
+ let [first, middle, last] = s:make_simple_location_list()
lnext!
- call assert_fails('execute "lfdo buffer ' . l:first . '"', "E1513:")
- call assert_equal(l:middle, bufnr())
- execute "lfdo! buffer " . l:first
- call assert_notequal(l:last, bufnr())
+ call assert_fails('exe "lfdo buffer ' .. first .. '"', "E1513:")
+ call assert_equal(middle, bufnr())
+ exe $"lfdo! buffer {first}"
+ call assert_notequal(last, bufnr())
endfunc
" Fail :lfile but :lfile! is allowed
@@ -1585,10 +1585,10 @@ func Test_lfile()
set winfixbuf
- call assert_fails(":lfile " . l:file)
+ call assert_fails($":lfile {l:file}", "E1513: Cannot switch buffer.
'winfixbuf' is enabled")
call assert_equal(l:current, bufnr())
- execute ":lfile! " . l:file
+ exe $":lfile! {l:file}"
call assert_equal(l:first, bufnr())
call delete("first.unittest")
@@ -1603,15 +1603,15 @@ func Test_ll()
let [l:first, l:middle, l:last] = s:make_simple_location_list()
lopen
lfirst!
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
normal j
call assert_fails(".ll", "E1513:")
- execute "normal \<C-w>k"
+ exe "normal \<C-w>k"
call assert_equal(l:first, bufnr())
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
.ll!
- execute "normal \<C-w>k"
+ exe "normal \<C-w>k"
call assert_equal(l:middle, bufnr())
endfunc
@@ -1734,7 +1734,7 @@ func Test_ltag()
call writefile(["one", "two", "three"], "Xfile", 'D')
call writefile(["one"], "Xother", 'D')
edit Xother
- execute "normal \<C-]>"
+ exe "normal \<C-]>"
set winfixbuf
@@ -1762,10 +1762,10 @@ func Test_lua_command()
set winfixbuf
- call assert_fails('lua vim.command("buffer " .. ' . l:previous . ')')
+ call assert_fails($'lua vim.command("buffer " .. {l:previous})')
call assert_equal(l:current, bufnr())
- execute 'lua vim.command("buffer! " .. ' . l:previous . ')'
+ exe $'lua vim.command("buffer! " .. {l:previous})'
call assert_equal(l:previous, bufnr())
endfunc
@@ -1826,7 +1826,7 @@ func Test_lvimgrepadd()
buffer! winfix.unittest
- call assert_fails("lvimgrepadd /some-search-term/ *.unittest")
+ call assert_fails("lvimgrepadd /some-search-term/ *.unittest", "E1513:
Cannot switch buffer. 'winfixbuf' is enabled")
call assert_equal(l:current, bufnr())
lvimgrepadd! /some-search-term/ *.unittest
@@ -1843,9 +1843,9 @@ func Test_marks_mappings_fail()
let l:other = s:make_buffer_pairs()
let l:current = bufnr()
- execute "buffer! " . l:other
+ exe $"buffer! {l:other}"
normal mA
- execute "buffer! " . l:current
+ exe $"buffer! {l:current}"
normal mB
call assert_fails("normal `A", "E1513:")
@@ -1979,7 +1979,7 @@ func Test_normal_g_rightmouse()
call writefile(["one", "two", "three"], "Xfile", 'D')
call writefile(["one"], "Xother", 'D')
edit Xother
- execute "normal \<C-]>"
+ exe "normal \<C-]>"
set winfixbuf
@@ -2030,7 +2030,7 @@ func Test_normal_ctrl_rightmouse()
call writefile(["one", "two", "three"], "Xfile", 'D')
call writefile(["one"], "Xother", 'D')
edit Xother
- execute "normal \<C-]>"
+ exe "normal \<C-]>"
set winfixbuf
@@ -2056,7 +2056,7 @@ func Test_normal_ctrl_t()
call writefile(["one", "two", "three"], "Xfile", 'D')
call writefile(["one"], "Xother", 'D')
edit Xother
- execute "normal \<C-]>"
+ exe "normal \<C-]>"
set winfixbuf
@@ -2105,12 +2105,12 @@ func Test_normal_ctrl_i_pass()
" Go up another line
normal m`
normal k
- execute "normal \<C-o>"
+ exe "normal \<C-o>"
set winfixbuf
let l:line = getcurpos()[1]
- execute "normal 1\<C-i>"
+ exe "normal 1\<C-i>"
call assert_notequal(l:line, getcurpos()[1])
endfunc
@@ -2154,7 +2154,7 @@ func Test_normal_ctrl_o_pass()
set winfixbuf
- execute "normal \<C-o>"
+ exe "normal \<C-o>"
call assert_equal(l:current, bufnr())
endfunc
@@ -2199,7 +2199,7 @@ func Test_normal_ctrl_w_ctrl_square_bracket_right()
set winfixbuf
let l:current_windows = s:get_windows_count()
- execute "normal \<C-w>\<C-]>"
+ exe "normal \<C-w>\<C-]>"
call assert_equal(l:current_windows + 1, s:get_windows_count())
set tags&
@@ -2222,7 +2222,7 @@ func Test_normal_ctrl_w_g_ctrl_square_bracket_right()
set winfixbuf
let l:current_windows = s:get_windows_count()
- execute "normal \<C-w>g\<C-]>"
+ exe "normal \<C-w>g\<C-]>"
call assert_equal(l:current_windows + 1, s:get_windows_count())
set tags&
@@ -2340,9 +2340,9 @@ endfunc
func Test_normal_square_bracket_left_ctrl_d()
call s:reset_all_buffers()
- let l:include_file = tempname() . ".h"
+ let l:include_file = tempname() .. ".h"
call writefile(["min(1, 12);",
- \ '#include "' . l:include_file . '"'
+ \ $'#include "{l:include_file}"'
\ ],
\ "main.c", 'D')
call writefile(["#define min(X, Y) ((X) < (Y) ? (X) : (Y))"],
l:include_file, 'D')
@@ -2358,7 +2358,7 @@ func Test_normal_square_bracket_left_ctrl_d()
set nowinfixbuf
- execute "normal [\<C-d>"
+ exe "normal [\<C-d>"
call assert_notequal(l:current, bufnr())
endfunc
@@ -2366,9 +2366,9 @@ endfunc
func Test_normal_square_bracket_right_ctrl_d()
call s:reset_all_buffers()
- let l:include_file = tempname() . ".h"
+ let l:include_file = tempname() .. ".h"
call writefile(["min(1, 12);",
- \ '#include "' . l:include_file . '"'
+ \ $'#include "{l:include_file}"'
\ ],
\ "main.c", 'D')
call writefile(["#define min(X, Y) ((X) < (Y) ? (X) : (Y))"],
l:include_file, 'D')
@@ -2383,7 +2383,7 @@ func Test_normal_square_bracket_right_ctrl_d()
set nowinfixbuf
- execute "normal ]\<C-d>"
+ exe "normal ]\<C-d>"
call assert_notequal(l:current, bufnr())
endfunc
@@ -2391,8 +2391,8 @@ endfunc
func Test_normal_square_bracket_left_ctrl_i()
call s:reset_all_buffers()
- let l:include_file = tempname() . ".h"
- call writefile(['#include "' . l:include_file . '"',
+ let l:include_file = tempname() .. ".h"
+ call writefile([$'#include "{l:include_file}"',
\ "min(1, 12);",
\ ],
\ "main.c", 'D')
@@ -2413,7 +2413,7 @@ func Test_normal_square_bracket_left_ctrl_i()
set nowinfixbuf
- execute "normal [\<C-i>"
+ exe "normal [\<C-i>"
call assert_notequal(l:current, bufnr())
set define&
@@ -2425,9 +2425,9 @@ endfunc
func Test_normal_square_bracket_right_ctrl_i()
call s:reset_all_buffers()
- let l:include_file = tempname() . ".h"
+ let l:include_file = tempname() .. ".h"
call writefile(["min(1, 12);",
- \ '#include "' . l:include_file . '"'
+ \ $'#include "{l:include_file}"'
\ ],
\ "main.c", 'D')
call writefile(["#define min(X, Y) ((X) < (Y) ? (X) : (Y))"],
l:include_file, 'D')
@@ -2446,7 +2446,7 @@ func Test_normal_square_bracket_right_ctrl_i()
set nowinfixbuf
- execute "normal ]\<C-i>"
+ exe "normal ]\<C-i>"
call assert_notequal(l:current, bufnr())
set define&
@@ -2538,7 +2538,7 @@ func Test_pedit()
pedit other
- execute "normal \<C-w>w"
+ exe "normal \<C-w>w"
call assert_equal(l:other, bufnr())
endfunc
@@ -2548,9 +2548,9 @@ func Test_pbuffer()
let l:other = s:make_buffer_pairs()
- exe 'pbuffer ' . l:other
+ exe $'pbuffer {l:other}'
- execute "normal \<C-w>w"
+ exe "normal \<C-w>w"
call assert_equal(l:other, bufnr())
endfunc
@@ -2735,7 +2735,7 @@ func Test_remap_key_pass()
" Disallow <C-^> by default but allow it if the command does something else
nnoremap <C-^> :echo "hello!"
- execute "normal \<C-^>"
+ exe "normal \<C-^>"
call assert_equal(l:current, bufnr())
nunmap <C-^>
@@ -2814,7 +2814,7 @@ func Test_split_window()
call s:reset_all_buffers()
split
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
set winfixbuf
@@ -2842,7 +2842,7 @@ func Test_tNext()
edit Xother
tag thesame
- execute "normal \<C-^>"
+ exe "normal \<C-^>"
tnext!
set winfixbuf
@@ -2875,7 +2875,7 @@ func Test_tabdo_choose_available_window()
split
let l:nowinfixbuf_window = win_getid()
" Move to the 'winfixbuf' window now
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
let l:winfixbuf_window = win_getid()
let l:expected_windows = s:get_windows_count()
@@ -2890,7 +2890,7 @@ func Test_tabdo_make_new_window()
call s:reset_all_buffers()
let [l:first, _] = s:make_buffers_list()
- execute "buffer! " . l:first
+ exe $"buffer! {l:first}"
let l:current = win_getid()
let l:current_windows = s:get_windows_count()
@@ -2898,7 +2898,7 @@ func Test_tabdo_make_new_window()
tabdo echo ''
call assert_notequal(l:current, win_getid())
call assert_equal(l:first, bufnr())
- execute "normal \<C-w>j"
+ exe "normal \<C-w>j"
call assert_equal(l:first, bufnr())
call assert_equal(l:current_windows + 1, s:get_windows_count())
endfunc
@@ -3030,7 +3030,7 @@ func Test_tnext()
edit Xother
tag thesame
- execute "normal \<C-^>"
+ exe "normal \<C-^>"
set winfixbuf
@@ -3061,7 +3061,7 @@ func Test_tprevious()
edit Xother
tag thesame
- execute "normal \<C-^>"
+ exe "normal \<C-^>"
tnext!
set winfixbuf
@@ -3127,7 +3127,7 @@ func Test_vimgrep()
buffer! winfix.unittest
- call assert_fails("vimgrep /some-search-term/ *.unittest")
+ call assert_fails("vimgrep /some-search-term/ *.unittest", "E1513: Cannot
switch buffer. 'winfixbuf' is enabled")
call assert_equal(l:current, bufnr())
" Don't error and also do swap to the first match because ! was included
@@ -3162,7 +3162,7 @@ func Test_vimgrepadd()
buffer! winfix.unittest
- call assert_fails("vimgrepadd /some-search-term/ *.unittest")
+ call assert_fails("vimgrepadd /some-search-term/ *.unittest", "E1513: Cannot
switch buffer. 'winfixbuf' is enabled")
call assert_equal(l:current, bufnr())
vimgrepadd! /some-search-term/ *.unittest
@@ -3207,10 +3207,10 @@ func Test_windo()
windo echo ''
call assert_equal(l:current_window, win_getid())
- call assert_fails('execute "windo buffer ' . l:current_buffer . '"',
"E1513:")
+ call assert_fails($'exe "windo buffer {l:current_buffer}"', "E1513:")
call assert_equal(l:current_window, win_getid())
- execute "windo buffer! " . l:current_buffer
+ exe $"windo buffer! {l:current_buffer}"
call assert_equal(l:current_window, win_getid())
endfunc
@@ -3259,7 +3259,7 @@ func Test_quickfix_switchbuf_invalid_prevwin()
set switchbuf=uselast
split
copen
- execute winnr('#') 'quit'
+ exe winnr('#') 'quit'
call assert_equal(2, winnr('$'))
cnext " Would've triggered a null pointer member access
diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index 51c55d2c7..cd427ad99 100644
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -170,7 +170,7 @@ func Test_writefile_autowrite()
next
call assert_equal(['aaa'], readfile('Xa'))
call setline(1, 'bbb')
- call assert_fails('edit XX')
+ call assert_fails('edit XX', 'E37: No write since last change (add ! to
override)')
call assert_false(filereadable('Xb'))
set autowriteall
diff --git a/src/version.c b/src/version.c
index ee6e5b817..7560da6ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1708,
/**/
1707,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1us1kn-009VlN-Ts%40256bit.org.
