patch 9.0.1258: code style test fails
Problem: Code style test fails.
Solution: Adjust test files.
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index cd68bfd..7e1a0fc 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3681,23 +3681,23 @@
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 c489ae5..3d5148e 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -542,12 +542,12 @@
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 @@
endtry
assert_equal(266, n)
- l = [1, 2, 3]
+ l = [1, 2, 3]
try
[n] = l
catch /E1093:/
@@ -1336,7 +1336,7 @@
endfunc
set laststatus=2 statusline=%!Status()
redrawstatus
- set laststatus statusline=
+ set laststatus statusline=
END
v9.CheckScriptSuccess(lines)
enddef
@@ -3601,7 +3601,7 @@
END
v9.CheckScriptFailure(lines, 'E1269:')
enddef
-
+
def Test_lock_script_var()
var lines =<< trim END
vim9script
@@ -3626,7 +3626,7 @@
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 828ccae..0cc20ca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1258,
+/**/
1257,
/**/
1256,