From 291fd767e3979b25146c32115eacc3c2f8e1e517 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 29 Apr 2023 07:51:58 +0800 Subject: vim-patch:8.2.0551: not all code for options is tested Problem: Not all code for options is tested. Solution: Add more tests. (Yegappan Lakshmanan, closes vim/vim#5913) https://github.com/vim/vim/commit/1363a30cef382b912bf092969e040333c5c293c6 --- test/old/testdir/test_python3.vim | 78 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) (limited to 'test/old/testdir/test_python3.vim') diff --git a/test/old/testdir/test_python3.vim b/test/old/testdir/test_python3.vim index 69f5f6dcc0..6c9676603f 100644 --- a/test/old/testdir/test_python3.vim +++ b/test/old/testdir/test_python3.vim @@ -40,7 +40,7 @@ func Test_set_cursor() endfunc func Test_vim_function() - throw 'skipped: Nvim does not support vim.bindeval()' + throw 'Skipped: Nvim does not support vim.bindeval()' " Check creating vim.Function object py3 import vim @@ -68,7 +68,7 @@ func Test_vim_function() endfunc func Test_skipped_python3_command_does_not_affect_pyxversion() - throw 'skipped: Nvim hardcodes pyxversion=3' + throw 'Skipped: Nvim hardcodes pyxversion=3' set pyxversion=0 if 0 python3 import vim @@ -190,3 +190,77 @@ func Test_unicode() set encoding=utf8 endfunc + +" Test for resetting options with local values to global values +func Test_python3_opt_reset_local_to_global() + throw 'Skipped: Nvim does not support vim.bindeval()' + new + + py3 curbuf = vim.current.buffer + py3 curwin = vim.current.window + + " List of buffer-local options. Each list item has [option name, global + " value, buffer-local value, buffer-local value after reset] to use in the + " test. + let bopts = [ + \ ['autoread', 1, 0, -1], + \ ['equalprg', 'geprg', 'leprg', ''], + \ ['keywordprg', 'gkprg', 'lkprg', ''], + \ ['path', 'gpath', 'lpath', ''], + \ ['backupcopy', 'yes', 'no', ''], + \ ['tags', 'gtags', 'ltags', ''], + \ ['tagcase', 'ignore', 'match', ''], + \ ['define', 'gdef', 'ldef', ''], + \ ['include', 'ginc', 'linc', ''], + \ ['dict', 'gdict', 'ldict', ''], + \ ['thesaurus', 'gtsr', 'ltsr', ''], + \ ['formatprg', 'gfprg', 'lfprg', ''], + \ ['errorformat', '%f:%l:%m', '%s-%l-%m', ''], + \ ['grepprg', 'ggprg', 'lgprg', ''], + \ ['makeprg', 'gmprg', 'lmprg', ''], + \ ['balloonexpr', 'gbexpr', 'lbexpr', ''], + \ ['cryptmethod', 'blowfish2', 'zip', ''], + \ ['lispwords', 'abc', 'xyz', ''], + \ ['makeencoding', 'utf-8', 'latin1', ''], + \ ['undolevels', 100, 200, -123456]] + + " Set the global and buffer-local option values and then clear the + " buffer-local option value. + for opt in bopts + py3 pyopt = vim.bindeval("opt") + py3 vim.options[pyopt[0]] = pyopt[1] + py3 curbuf.options[pyopt[0]] = pyopt[2] + exe "call assert_equal(opt[2], &" .. opt[0] .. ")" + exe "call assert_equal(opt[1], &g:" .. opt[0] .. ")" + exe "call assert_equal(opt[2], &l:" .. opt[0] .. ")" + py3 del curbuf.options[pyopt[0]] + exe "call assert_equal(opt[1], &" .. opt[0] .. ")" + exe "call assert_equal(opt[1], &g:" .. opt[0] .. ")" + exe "call assert_equal(opt[3], &l:" .. opt[0] .. ")" + exe "set " .. opt[0] .. "&" + endfor + + " Set the global and window-local option values and then clear the + " window-local option value. + let wopts = [ + \ ['scrolloff', 5, 10, -1], + \ ['sidescrolloff', 6, 12, -1], + \ ['statusline', '%<%f', '%<%F', '']] + for opt in wopts + py3 pyopt = vim.bindeval("opt") + py3 vim.options[pyopt[0]] = pyopt[1] + py3 curwin.options[pyopt[0]] = pyopt[2] + exe "call assert_equal(opt[2], &" .. opt[0] .. ")" + exe "call assert_equal(opt[1], &g:" .. opt[0] .. ")" + exe "call assert_equal(opt[2], &l:" .. opt[0] .. ")" + py3 del curwin.options[pyopt[0]] + exe "call assert_equal(opt[1], &" .. opt[0] .. ")" + exe "call assert_equal(opt[1], &g:" .. opt[0] .. ")" + exe "call assert_equal(opt[3], &l:" .. opt[0] .. ")" + exe "set " .. opt[0] .. "&" + endfor + + close! +endfunc + +" vim: shiftwidth=2 sts=2 expandtab -- cgit From 4bcf8c15b3079ca72d6557890b50b35565fcd577 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 29 Apr 2023 08:12:32 +0800 Subject: vim-patch:8.2.0578: heredoc for interfaces does not support "trim" Problem: Heredoc for interfaces does not support "trim". Solution: Update the script heredoc support to be same as the :let command. (Yegappan Lakshmanan, closes vim/vim#5916) https://github.com/vim/vim/commit/6c2b7b8055b96463f78abb70f58c4c6d6d4b9d55 --- test/old/testdir/test_python3.vim | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) (limited to 'test/old/testdir/test_python3.vim') diff --git a/test/old/testdir/test_python3.vim b/test/old/testdir/test_python3.vim index 6c9676603f..60773c5b2a 100644 --- a/test/old/testdir/test_python3.vim +++ b/test/old/testdir/test_python3.vim @@ -227,9 +227,11 @@ func Test_python3_opt_reset_local_to_global() " Set the global and buffer-local option values and then clear the " buffer-local option value. for opt in bopts - py3 pyopt = vim.bindeval("opt") - py3 vim.options[pyopt[0]] = pyopt[1] - py3 curbuf.options[pyopt[0]] = pyopt[2] + py3 << trim END + pyopt = vim.bindeval("opt") + vim.options[pyopt[0]] = pyopt[1] + curbuf.options[pyopt[0]] = pyopt[2] + END exe "call assert_equal(opt[2], &" .. opt[0] .. ")" exe "call assert_equal(opt[1], &g:" .. opt[0] .. ")" exe "call assert_equal(opt[2], &l:" .. opt[0] .. ")" @@ -247,9 +249,11 @@ func Test_python3_opt_reset_local_to_global() \ ['sidescrolloff', 6, 12, -1], \ ['statusline', '%<%f', '%<%F', '']] for opt in wopts - py3 pyopt = vim.bindeval("opt") - py3 vim.options[pyopt[0]] = pyopt[1] - py3 curwin.options[pyopt[0]] = pyopt[2] + py3 << trim + pyopt = vim.bindeval("opt") + vim.options[pyopt[0]] = pyopt[1] + curwin.options[pyopt[0]] = pyopt[2] + . exe "call assert_equal(opt[2], &" .. opt[0] .. ")" exe "call assert_equal(opt[1], &g:" .. opt[0] .. ")" exe "call assert_equal(opt[2], &l:" .. opt[0] .. ")" @@ -263,4 +267,21 @@ func Test_python3_opt_reset_local_to_global() close! endfunc +" Test for various heredoc syntax +func Test_python3_heredoc() + python3 << END +s='A' +END + python3 << +s+='B' +. + python3 << trim END + s+='C' + END + python3 << trim + s+='D' + . + call assert_equal('ABCD', pyxeval('s')) +endfunc + " vim: shiftwidth=2 sts=2 expandtab -- cgit From 2eb1f62e29c54fe4d3cebcff388ea6c239313980 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 29 Apr 2023 08:50:04 +0800 Subject: vim-patch:8.2.0672: heredoc in scripts does not accept lower case marker Problem: Heredoc in scripts does not accept lower case marker. Solution: Allow lower case only in non-Vim scripts. (Ken Takata, closes vim/vim#6019) https://github.com/vim/vim/commit/6ab0953fefe31fef91e40752a675ceb60fc2fe03 --- test/old/testdir/test_python3.vim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test/old/testdir/test_python3.vim') diff --git a/test/old/testdir/test_python3.vim b/test/old/testdir/test_python3.vim index 60773c5b2a..23c63f22d8 100644 --- a/test/old/testdir/test_python3.vim +++ b/test/old/testdir/test_python3.vim @@ -281,7 +281,10 @@ s+='B' python3 << trim s+='D' . - call assert_equal('ABCD', pyxeval('s')) + python3 << trim eof + s+='E' + eof + call assert_equal('ABCDE', pyxeval('s')) endfunc " vim: shiftwidth=2 sts=2 expandtab -- cgit