Patch 9.0.1258

[Bram Moolenaar]

Patch 9.0.1258 (after 9.0.1257)
Problem: Code style test fails.
Solution: Adjust test files.
Files: src/testdir/test_popupwin.vim, src/testdir/test_vim9_script.vim


*** ../vim-9.0.1257/src/testdir/test_popupwin.vim 2022-12-02 15:06:03.740761560 +0000
--- src/testdir/test_popupwin.vim 2023-01-28 18:15:35.751892615 +0000
***************
*** 3681,3703 ****

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',
! \ },
! \ ]
\ }
endfunc
END
--- 3681,3703 ----

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',
! \ },
! \ ]
\ }
endfunc
END
*** ../vim-9.0.1257/src/testdir/test_vim9_script.vim 2022-12-12 18:56:27.881463277 +0000
--- src/testdir/test_vim9_script.vim 2023-01-28 18:44:01.426997089 +0000
***************
*** 542,553 ****
if 1
else
try | catch /pat/ | endtry
! try | catch /pat/
endtry
! try
catch /pat/ | endtry
! try
! catch /pat/
endtry
endif

--- 542,553 ----
if 1
else
try | catch /pat/ | endtry
! try | catch /pat/
endtry
! try
catch /pat/ | endtry
! try
! catch /pat/
endtry
endif

***************
*** 617,623 ****
endtry
assert_equal(266, n)

! l = [1, 2, 3]
try
[n] = l
catch /E1093:/
--- 617,623 ----
endtry
assert_equal(266, n)

! l = [1, 2, 3]
try
[n] = l
catch /E1093:/
***************
*** 1336,1342 ****
endfunc
set laststatus=2 statusline=%!Status()
redrawstatus
! set laststatus statusline=
END
v9.CheckScriptSuccess(lines)
enddef
--- 1336,1342 ----
endfunc
set laststatus=2 statusline=%!Status()
redrawstatus
! set laststatus statusline=
END
v9.CheckScriptSuccess(lines)
enddef
***************
*** 3601,3607 ****
END
v9.CheckScriptFailure(lines, 'E1269:')
enddef
!
def Test_lock_script_var()
var lines =<< trim END
vim9script
--- 3601,3607 ----
END
v9.CheckScriptFailure(lines, 'E1269:')
enddef
!
def Test_lock_script_var()
var lines =<< trim END
vim9script
***************
*** 3626,3632 ****
END
v9.CheckScriptSuccess(lines)
enddef
!

func Test_vim9script_not_global()
" check that items defined in Vim9 script are script-local, not global
--- 3626,3632 ----
END
v9.CheckScriptSuccess(lines)
enddef
!

func Test_vim9script_not_global()
" check that items defined in Vim9 script are script-local, not global
*** ../vim-9.0.1257/src/version.c 2023-01-28 19:18:56.741720608 +0000
--- src/version.c 2023-01-28 19:38:30.297690154 +0000
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1258,
/**/

--
Q: Should I clean my house or work on Vim?
A: Whatever contains more bugs.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///