Skip to content

Commit 755bf2b

Browse files
committed
patch 9.0.1258: code style test fails
Problem: Code style test fails. Solution: Adjust test files.
1 parent 94722c5 commit 755bf2b

3 files changed

Lines changed: 27 additions & 25 deletions

File tree

src/testdir/test_popupwin.vim

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3681,23 +3681,23 @@ func Test_popupmenu_info_too_wide()
36813681

36823682
let menuText = 'some long text to make sure the menu takes up all of the width of the window'
36833683
return #{
3684-
\ words: [
3685-
\ #{
3686-
\ word: 'scrap',
3687-
\ menu: menuText,
3688-
\ info: "other words are\ncooler than this and some more text\nto make wrap",
3689-
\ },
3690-
\ #{
3691-
\ word: 'scappier',
3692-
\ menu: menuText,
3693-
\ info: 'words are cool',
3694-
\ },
3695-
\ #{
3696-
\ word: 'scrappier2',
3697-
\ menu: menuText,
3698-
\ info: 'words are cool',
3699-
\ },
3700-
\ ]
3684+
\ words: [
3685+
\ #{
3686+
\ word: 'scrap',
3687+
\ menu: menuText,
3688+
\ info: "other words are\ncooler than this and some more text\nto make wrap",
3689+
\ },
3690+
\ #{
3691+
\ word: 'scappier',
3692+
\ menu: menuText,
3693+
\ info: 'words are cool',
3694+
\ },
3695+
\ #{
3696+
\ word: 'scrappier2',
3697+
\ menu: menuText,
3698+
\ info: 'words are cool',
3699+
\ },
3700+
\ ]
37013701
\ }
37023702
endfunc
37033703
END

src/testdir/test_vim9_script.vim

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -542,12 +542,12 @@ def Test_try_catch_throw()
542542
if 1
543543
else
544544
try | catch /pat/ | endtry
545-
try | catch /pat/
545+
try | catch /pat/
546546
endtry
547-
try
547+
try
548548
catch /pat/ | endtry
549-
try
550-
catch /pat/
549+
try
550+
catch /pat/
551551
endtry
552552
endif
553553

@@ -617,7 +617,7 @@ def Test_try_catch_throw()
617617
endtry
618618
assert_equal(266, n)
619619

620-
l = [1, 2, 3]
620+
l = [1, 2, 3]
621621
try
622622
[n] = l
623623
catch /E1093:/
@@ -1336,7 +1336,7 @@ def Test_statusline_syntax()
13361336
endfunc
13371337
set laststatus=2 statusline=%!Status()
13381338
redrawstatus
1339-
set laststatus statusline=
1339+
set laststatus statusline=
13401340
END
13411341
v9.CheckScriptSuccess(lines)
13421342
enddef
@@ -3601,7 +3601,7 @@ def Test_declare_script_var_in_func()
36013601
END
36023602
v9.CheckScriptFailure(lines, 'E1269:')
36033603
enddef
3604-
3604+
36053605
def Test_lock_script_var()
36063606
var lines =<< trim END
36073607
vim9script
@@ -3626,7 +3626,7 @@ def Test_lock_script_var()
36263626
END
36273627
v9.CheckScriptSuccess(lines)
36283628
enddef
3629-
3629+
36303630

36313631
func Test_vim9script_not_global()
36323632
" check that items defined in Vim9 script are script-local, not global

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1258,
698700
/**/
699701
1257,
700702
/**/

0 commit comments

Comments
 (0)