diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-08-24 20:50:19 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-08-24 20:50:19 +0200 |
commit | a4208966fb289a505ebdef62bbc37c214069bab4 (patch) | |
tree | 97ec3983559c99f47bdb9213f96a95f403af35f0 /src/testdir | |
parent | f63962378dc32c7253e4825b4b0f414a81c1dd3e (diff) | |
download | vim-git-a4208966fb289a505ebdef62bbc37c214069bab4.tar.gz |
patch 8.1.1921: more functions can be used as methodsv8.1.1921
Problem: More functions can be used as methods.
Solution: Make various functions usable as a method.
Diffstat (limited to 'src/testdir')
-rw-r--r-- | src/testdir/test_expand.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_expand_func.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_expr.vim | 4 | ||||
-rw-r--r-- | src/testdir/test_findfile.vim | 4 | ||||
-rw-r--r-- | src/testdir/test_fnameescape.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_fnamemodify.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_fold.vim | 8 | ||||
-rw-r--r-- | src/testdir/test_functions.vim | 17 | ||||
-rw-r--r-- | src/testdir/test_search.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_vimscript.vim | 2 |
10 files changed, 23 insertions, 22 deletions
diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim index bd8021f9f..53f753d3f 100644 --- a/src/testdir/test_expand.vim +++ b/src/testdir/test_expand.vim @@ -58,7 +58,7 @@ func Test_expandcmd() call assert_equal('e Xfile1', expandcmd('e %')) edit Xfile2 edit Xfile1 - call assert_equal('e Xfile2', expandcmd('e #')) + call assert_equal('e Xfile2', 'e #'->expandcmd()) edit Xfile2 edit Xfile3 edit Xfile4 diff --git a/src/testdir/test_expand_func.vim b/src/testdir/test_expand_func.vim index f6e529363..f9c5b5f2c 100644 --- a/src/testdir/test_expand_func.vim +++ b/src/testdir/test_expand_func.vim @@ -68,7 +68,7 @@ endfunc func Test_expand() new call assert_equal("", expand('%:S')) - call assert_equal('3', expand('<slnum>')) + call assert_equal('3', '<slnum>'->expand()) call assert_equal(['4'], expand('<slnum>', v:false, v:true)) " Don't add any line above this, otherwise <slnum> will change. quit diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim index ccca79270..9f4373278 100644 --- a/src/testdir/test_expr.vim +++ b/src/testdir/test_expr.vim @@ -403,7 +403,7 @@ function Test_printf_spec_s() call assert_equal(string(value), printf('%s', value)) " funcref - call assert_equal('printf', printf('%s', function('printf'))) + call assert_equal('printf', printf('%s', 'printf'->function())) " partial call assert_equal(string(function('printf', ['%s'])), printf('%s', function('printf', ['%s']))) @@ -490,7 +490,7 @@ func Test_funcref() endfunc call assert_equal(2, OneByName()) call assert_equal(1, OneByRef()) - let OneByRef = funcref('One') + let OneByRef = 'One'->funcref() call assert_equal(2, OneByRef()) call assert_fails('echo funcref("{")', 'E475:') endfunc diff --git a/src/testdir/test_findfile.vim b/src/testdir/test_findfile.vim index 0bae161a8..5cda2ea82 100644 --- a/src/testdir/test_findfile.vim +++ b/src/testdir/test_findfile.vim @@ -50,7 +50,7 @@ func Test_findfile() set path=. call assert_equal('Xdir2/foo', findfile('foo')) call assert_equal('', findfile('bar')) - call assert_equal('Xdir2/foobar', findfile('foobar')) + call assert_equal('Xdir2/foobar', 'foobar'->findfile()) " Empty {path} 2nd argument is the same as no 2nd argument. call assert_equal('Xdir2/foo', findfile('foo', '')) @@ -137,7 +137,7 @@ func Test_finddir() cd Xdir1 call assert_equal('Xdir2', finddir('Xdir2')) - call assert_equal('', finddir('Xdir3')) + call assert_equal('', 'Xdir3'->finddir()) " Files should not be found (findfile() finds them). call assert_equal('', finddir('foo')) diff --git a/src/testdir/test_fnameescape.vim b/src/testdir/test_fnameescape.vim index 5382b89aa..b0fdb3a03 100644 --- a/src/testdir/test_fnameescape.vim +++ b/src/testdir/test_fnameescape.vim @@ -13,7 +13,7 @@ func Test_fnameescape() let fname = 'Xemark!' let status = v:false try - exe "w! " . fnameescape(fname) + exe "w! " . fname->fnameescape() let status = v:true endtry call assert_true(status, "ExclamationMark") diff --git a/src/testdir/test_fnamemodify.vim b/src/testdir/test_fnamemodify.vim index 63f273677..fd5f1efb8 100644 --- a/src/testdir/test_fnamemodify.vim +++ b/src/testdir/test_fnamemodify.vim @@ -13,7 +13,7 @@ func Test_fnamemodify() call assert_equal('a', fnamemodify('../testdir/a', ':.')) call assert_equal('~/testdir/test.out', fnamemodify('test.out', ':~')) call assert_equal('~/testdir/a', fnamemodify('../testdir/a', ':~')) - call assert_equal('a', fnamemodify('../testdir/a', ':t')) + call assert_equal('a', '../testdir/a'->fnamemodify(':t')) call assert_equal('', fnamemodify('.', ':p:t')) call assert_equal('test.out', fnamemodify('test.out', ':p:t')) call assert_equal('out', fnamemodify('test.out', ':p:e')) diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim index 1d5259f6b..7aef51f8b 100644 --- a/src/testdir/test_fold.vim +++ b/src/testdir/test_fold.vim @@ -89,7 +89,7 @@ func Test_indent_fold2() setl fen fdm=marker 2 norm! >> - let a=map(range(1,5), 'foldclosed(v:val)') + let a=map(range(1,5), 'v:val->foldclosed()') call assert_equal([-1,-1,-1,4,4], a) bw! endfunc @@ -133,7 +133,7 @@ func Test_indent_fold_with_read() call assert_equal(0, foldlevel(3)) call assert_equal(0, foldlevel(4)) call assert_equal(1, foldlevel(5)) - call assert_equal(7, foldclosedend(5)) + call assert_equal(7, 5->foldclosedend()) bwipe! set foldmethod& @@ -208,7 +208,7 @@ func Test_update_folds_expr_read() %foldclose call assert_equal(2, foldclosedend(1)) call assert_equal(0, foldlevel(3)) - call assert_equal(0, foldlevel(4)) + call assert_equal(0, 4->foldlevel()) call assert_equal(6, foldclosedend(5)) call assert_equal(10, foldclosedend(7)) call assert_equal(14, foldclosedend(11)) @@ -656,7 +656,7 @@ func Test_fold_move() call assert_equal(10, foldclosed(10)) call assert_equal(11, foldclosedend(10)) call assert_equal('+-- 2 lines: Line2', foldtextresult(2)) - call assert_equal('+-- 2 lines: Line8', foldtextresult(10)) + call assert_equal('+-- 2 lines: Line8', 10->foldtextresult()) set fdm& sw& fdl& enew! diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 7a3d05467..027700be7 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1001,7 +1001,7 @@ func Test_filewritable() call assert_equal(0, filewritable('Xfilewritable')) call assert_notequal(0, setfperm('Xfilewritable', 'rw-r-----')) - call assert_equal(1, filewritable('Xfilewritable')) + call assert_equal(1, 'Xfilewritable'->filewritable()) call assert_equal(0, filewritable('doesnotexist')) @@ -1012,20 +1012,21 @@ endfunc func Test_Executable() if has('win32') call assert_equal(1, executable('notepad')) - call assert_equal(1, executable('notepad.exe')) + call assert_equal(1, 'notepad.exe'->executable()) call assert_equal(0, executable('notepad.exe.exe')) call assert_equal(0, executable('shell32.dll')) call assert_equal(0, executable('win.ini')) elseif has('unix') - call assert_equal(1, executable('cat')) + call assert_equal(1, 'cat'->executable()) call assert_equal(0, executable('nodogshere')) " get "cat" path and remove the leading / let catcmd = exepath('cat')[1:] new + " check that the relative path works in / lcd / call assert_equal(1, executable(catcmd)) - call assert_equal('/' .. catcmd, exepath(catcmd)) + call assert_equal('/' .. catcmd, catcmd->exepath()) bwipe endif endfunc @@ -1349,7 +1350,7 @@ func Test_func_sandbox() sandbox let F = {-> 'hello'} call assert_equal('hello', F()) - sandbox let F = {-> execute("normal ix\<Esc>")} + sandbox let F = {-> "normal ix\<Esc>"->execute()} call assert_fails('call F()', 'E48:') unlet F @@ -1380,7 +1381,7 @@ func Test_func_exists_on_reload() call writefile(['func ExistingFunction()', 'echo "yes"', 'endfunc'], 'Xfuncexists') call assert_equal(0, exists('*ExistingFunction')) source Xfuncexists - call assert_equal(1, exists('*ExistingFunction')) + call assert_equal(1, '*ExistingFunction'->exists()) " Redefining a function when reloading a script is OK. source Xfuncexists call assert_equal(1, exists('*ExistingFunction')) @@ -1427,7 +1428,7 @@ func Test_confirm() " <Esc> requires another character to avoid it being seen as the start of an " escape sequence. Zero should be harmless. - call feedkeys("\<Esc>0", 'L') + eval "\<Esc>0"->feedkeys('L') let a = confirm('Are you sure?', "&Yes\n&No") call assert_equal(0, a) @@ -1525,7 +1526,7 @@ func Test_delete_rf() call writefile([], 'Xdir/[a-1]/foo.txt') call writefile([], 'Xdir/[a-1]/bar.txt') call assert_true(filereadable('Xdir/foo.txt')) - call assert_true(filereadable('Xdir/[a-1]/foo.txt')) + call assert_true('Xdir/[a-1]/foo.txt'->filereadable()) call assert_equal(0, delete('Xdir', 'rf')) call assert_false(filereadable('Xdir/foo.txt')) diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim index 604f3c2ed..7c30a1ac0 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -1303,7 +1303,7 @@ func Test_search_display_pattern() call cursor(1, 1) let @/ = 'foo' - let pat = escape(@/, '()*?'. '\s\+') + let pat = @/->escape('()*?'. '\s\+') let g:a = execute(':unsilent :norm! n') call assert_match(pat, g:a) diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim index dc4df4448..8dc00f233 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -638,7 +638,7 @@ function! MSG(enr, emsg) if v:errmsg == "" Xout "Message missing." else - let v:errmsg = escape(v:errmsg, '"') + let v:errmsg = v:errmsg->escape('"') Xout "Unexpected message:" v:errmsg endif endif |