diff options
author | Bram Moolenaar <Bram@vim.org> | 2023-01-28 19:38:49 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-01-28 19:38:49 +0000 |
commit | 755bf2b3d265ceb9c02752d4286a055e44f9ce29 (patch) | |
tree | 1cb3be6a1d067793fe0910ef24639d54b61d0ecd | |
parent | 94722c510745a0cfd494c51625a514b92dd2bfb2 (diff) | |
download | vim-git-755bf2b3d265ceb9c02752d4286a055e44f9ce29.tar.gz |
patch 9.0.1258: code style test failsv9.0.1258
Problem: Code style test fails.
Solution: Adjust test files.
-rw-r--r-- | src/testdir/test_popupwin.vim | 34 | ||||
-rw-r--r-- | src/testdir/test_vim9_script.vim | 16 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 27 insertions, 25 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index cd68bfd01..7e1a0fca8 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -3681,23 +3681,23 @@ func Test_popupmenu_info_too_wide() let menuText = 'some long text to make sure the menu takes up all of the width of the window' return #{ - \ words: [ - \ #{ - \ word: 'scrap', - \ menu: menuText, - \ info: "other words are\ncooler than this and some more text\nto make wrap", - \ }, - \ #{ - \ word: 'scappier', - \ menu: menuText, - \ info: 'words are cool', - \ }, - \ #{ - \ word: 'scrappier2', - \ menu: menuText, - \ info: 'words are cool', - \ }, - \ ] + \ words: [ + \ #{ + \ word: 'scrap', + \ menu: menuText, + \ info: "other words are\ncooler than this and some more text\nto make wrap", + \ }, + \ #{ + \ word: 'scappier', + \ menu: menuText, + \ info: 'words are cool', + \ }, + \ #{ + \ word: 'scrappier2', + \ menu: menuText, + \ info: 'words are cool', + \ }, + \ ] \ } endfunc END diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index c489ae55d..3d5148ecc 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -542,12 +542,12 @@ def Test_try_catch_throw() if 1 else try | catch /pat/ | endtry - try | catch /pat/ + try | catch /pat/ endtry - try + try catch /pat/ | endtry - try - catch /pat/ + try + catch /pat/ endtry endif @@ -617,7 +617,7 @@ def Test_try_catch_throw() endtry assert_equal(266, n) - l = [1, 2, 3] + l = [1, 2, 3] try [n] = l catch /E1093:/ @@ -1336,7 +1336,7 @@ def Test_statusline_syntax() endfunc set laststatus=2 statusline=%!Status() redrawstatus - set laststatus statusline= + set laststatus statusline= END v9.CheckScriptSuccess(lines) enddef @@ -3601,7 +3601,7 @@ def Test_declare_script_var_in_func() END v9.CheckScriptFailure(lines, 'E1269:') enddef - + def Test_lock_script_var() var lines =<< trim END vim9script @@ -3626,7 +3626,7 @@ def Test_lock_script_var() END v9.CheckScriptSuccess(lines) enddef - + func Test_vim9script_not_global() " check that items defined in Vim9 script are script-local, not global diff --git a/src/version.c b/src/version.c index 828ccaece..0cc20ca3b 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1258, +/**/ 1257, /**/ 1256, |