patch 8.2.1326: Vim9: skipping over white space after list
Problem: Vim9: skipping over white space after list.
Solution: Do not skip white space, a following [] would be misinterpreted.
(closes #6552) Fix a few side effects.
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 9aa830b..7aaeeb7 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1355,7 +1355,7 @@
func! Tcomplete(arglead, cmdline, pos)
return "item1\nitem2\nitem3"
endfunc
- call feedkeys(":let c = input('Q? ', '' , 'custom,Tcomplete')\<CR>"
+ call feedkeys(":let c = input('Q? ', '', 'custom,Tcomplete')\<CR>"
\ .. "\<C-A>\<CR>", 'xt')
delfunc Tcomplete
call assert_equal('item1 item2 item3', c)
diff --git a/src/testdir/test_gn.vim b/src/testdir/test_gn.vim
index c72da92..b90aa5f 100644
--- a/src/testdir/test_gn.vim
+++ b/src/testdir/test_gn.vim
@@ -120,7 +120,7 @@
sil! %d_
" search using the \zs atom
- call setline(1, [' nnoremap', '' , 'nnoremap'])
+ call setline(1, [' nnoremap', '', 'nnoremap'])
set wrapscan&vim
let @/ = '\_s\zsnnoremap'
$
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 00b956a..30dfc66 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -588,7 +588,7 @@
call setline(1, range(100))
for nr in range(7)
call setline(nr * 12 + 1, "fold {{{")
- call setline(nr * 12 + 11 , "end }}}")
+ call setline(nr * 12 + 11, "end }}}")
endfor
%foldclose
set shell=/bin/sh noruler
diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim
index 33fdab4..bbcafa8 100644
--- a/src/testdir/test_tabpage.vim
+++ b/src/testdir/test_tabpage.vim
@@ -350,7 +350,7 @@
call Check_tab_count(6, cmd . ' 3', 3)
call Check_tab_count(6, cmd . ' 8', 4)
for n in range(2)
- for c in ['0', '.+3', '+', '+2' , '-', '-2' , '$', '+99', '-99']
+ for c in ['0', '.+3', '+', '+2', '-', '-2', '$', '+99', '-99']
if n == 0 " pre count
let entire_cmd = c . cmd
let err_code = 'E16:'
diff --git a/src/testdir/test_textobjects.vim b/src/testdir/test_textobjects.vim
index 6eb6fbb..54de3f8 100644
--- a/src/testdir/test_textobjects.vim
+++ b/src/testdir/test_textobjects.vim
@@ -201,28 +201,28 @@
call assert_equal("c", matchstr("abcd", ".", 2, 0))
call assert_equal("a", matchstr("abcd", ".", 0, -1))
call assert_equal(-1, match("abcd", ".", 0, 5))
- call assert_equal(0 , match("abcd", ".", 0, -1))
- call assert_equal(0 , match('abc', '.', 0, 1))
- call assert_equal(1 , match('abc', '.', 0, 2))
- call assert_equal(2 , match('abc', '.', 0, 3))
+ call assert_equal(0, match("abcd", ".", 0, -1))
+ call assert_equal(0, match('abc', '.', 0, 1))
+ call assert_equal(1, match('abc', '.', 0, 2))
+ call assert_equal(2, match('abc', '.', 0, 3))
call assert_equal(-1, match('abc', '.', 0, 4))
- call assert_equal(1 , match('abc', '.', 1, 1))
- call assert_equal(2 , match('abc', '.', 2, 1))
+ call assert_equal(1, match('abc', '.', 1, 1))
+ call assert_equal(2, match('abc', '.', 2, 1))
call assert_equal(-1, match('abc', '.', 3, 1))
- call assert_equal(3 , match('abc', '$', 0, 1))
+ call assert_equal(3, match('abc', '$', 0, 1))
call assert_equal(-1, match('abc', '$', 0, 2))
- call assert_equal(3 , match('abc', '$', 1, 1))
- call assert_equal(3 , match('abc', '$', 2, 1))
- call assert_equal(3 , match('abc', '$', 3, 1))
+ call assert_equal(3, match('abc', '$', 1, 1))
+ call assert_equal(3, match('abc', '$', 2, 1))
+ call assert_equal(3, match('abc', '$', 3, 1))
call assert_equal(-1, match('abc', '$', 4, 1))
- call assert_equal(0 , match('abc', '\zs', 0, 1))
- call assert_equal(1 , match('abc', '\zs', 0, 2))
- call assert_equal(2 , match('abc', '\zs', 0, 3))
- call assert_equal(3 , match('abc', '\zs', 0, 4))
+ call assert_equal(0, match('abc', '\zs', 0, 1))
+ call assert_equal(1, match('abc', '\zs', 0, 2))
+ call assert_equal(2, match('abc', '\zs', 0, 3))
+ call assert_equal(3, match('abc', '\zs', 0, 4))
call assert_equal(-1, match('abc', '\zs', 0, 5))
- call assert_equal(1 , match('abc', '\zs', 1, 1))
- call assert_equal(2 , match('abc', '\zs', 2, 1))
- call assert_equal(3 , match('abc', '\zs', 3, 1))
+ call assert_equal(1, match('abc', '\zs', 1, 1))
+ call assert_equal(2, match('abc', '\zs', 2, 1))
+ call assert_equal(3, match('abc', '\zs', 3, 1))
call assert_equal(-1, match('abc', '\zs', 4, 1))
endfunc
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index d5f67b4..9db5275 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -1219,7 +1219,7 @@
call assert_fails('call prop_find({}, "x")', 'E474:')
call assert_fails('call prop_find({"lnum" : -2})', 'E16:')
call assert_fails('call prop_list(1, [])', 'E715:')
- call assert_fails('call prop_list(-1 , {})', 'E16:')
+ call assert_fails('call prop_list(-1, {})', 'E16:')
call assert_fails('call prop_remove([])', 'E474:')
call assert_fails('call prop_remove({}, -2)', 'E16:')
call assert_fails('call prop_remove({})', 'E968:')