@@ -1292,26 +1292,26 @@ func Test_expr5_fails()
12921292 call CheckDefFailure ([" var x = '1' ..'2'" ], msg, 1 )
12931293 call CheckDefFailure ([" var x = '1'.. '2'" ], msg, 1 )
12941294
1295- call CheckDefFailure ([" var x = 0z1122 + 33" ], ' E1051' , 1 )
1296- call CheckDefFailure ([" var x = 0z1122 + [3]" ], ' E1051' , 1 )
1297- call CheckDefFailure ([" var x = 0z1122 + 'asd'" ], ' E1051' , 1 )
1298- call CheckDefFailure ([" var x = 33 + 0z1122" ], ' E1051' , 1 )
1299- call CheckDefFailure ([" var x = [3] + 0z1122" ], ' E1051' , 1 )
1300- call CheckDefFailure ([" var x = 'asdf' + 0z1122" ], ' E1051' , 1 )
1301- call CheckDefFailure ([" var x = 6 + xxx" ], ' E1001' , 1 )
1302-
1303- call CheckDefFailure ([" var x = 'a' .. [1]" ], ' E1105' , 1 )
1304- call CheckDefFailure ([" var x = 'a' .. #{a: 1}" ], ' E1105' , 1 )
1305- call CheckDefFailure ([" var x = 'a' .. test_void()" ], ' E1105' , 1 )
1306- call CheckDefFailure ([" var x = 'a' .. 0z32" ], ' E1105' , 1 )
1307- call CheckDefFailure ([" var x = 'a' .. function('len')" ], ' E1105' , 1 )
1308- call CheckDefFailure ([" var x = 'a' .. function('len', ['a'])" ], ' E1105' , 1 )
1295+ call CheckDefFailure ([" var x = 0z1122 + 33" ], ' E1051: ' , 1 )
1296+ call CheckDefFailure ([" var x = 0z1122 + [3]" ], ' E1051: ' , 1 )
1297+ call CheckDefFailure ([" var x = 0z1122 + 'asd'" ], ' E1051: ' , 1 )
1298+ call CheckDefFailure ([" var x = 33 + 0z1122" ], ' E1051: ' , 1 )
1299+ call CheckDefFailure ([" var x = [3] + 0z1122" ], ' E1051: ' , 1 )
1300+ call CheckDefFailure ([" var x = 'asdf' + 0z1122" ], ' E1051: ' , 1 )
1301+ call CheckDefFailure ([" var x = 6 + xxx" ], ' E1001: ' , 1 )
1302+
1303+ call CheckDefFailure ([" var x = 'a' .. [1]" ], ' E1105: ' , 1 )
1304+ call CheckDefFailure ([" var x = 'a' .. #{a: 1}" ], ' E1105: ' , 1 )
1305+ call CheckDefFailure ([" var x = 'a' .. test_void()" ], ' E1105: ' , 1 )
1306+ call CheckDefFailure ([" var x = 'a' .. 0z32" ], ' E1105: ' , 1 )
1307+ call CheckDefFailure ([" var x = 'a' .. function('len')" ], ' E1105: ' , 1 )
1308+ call CheckDefFailure ([" var x = 'a' .. function('len', ['a'])" ], ' E1105: ' , 1 )
13091309endfunc
13101310
13111311func Test_expr5_fails_channel ()
13121312 CheckFeature channel
1313- call CheckDefFailure ([" var x = 'a' .. test_null_job()" ], ' E1105' , 1 )
1314- call CheckDefFailure ([" var x = 'a' .. test_null_channel()" ], ' E1105' , 1 )
1313+ call CheckDefFailure ([" var x = 'a' .. test_null_job()" ], ' E1105: ' , 1 )
1314+ call CheckDefFailure ([" var x = 'a' .. test_null_channel()" ], ' E1105: ' , 1 )
13151315endfunc
13161316
13171317" test multiply, divide, modulo
@@ -1352,7 +1352,7 @@ def Test_expr6()
13521352 * yf[0 ])
13531353 endif
13541354
1355- CheckDefFailure ([" var x = 6 * xxx" ], ' E1001' , 1 )
1355+ CheckDefFailure ([" var x = 6 * xxx" ], ' E1001: ' , 1 )
13561356enddef
13571357
13581358def Test_expr6_vim9script ()
@@ -1757,7 +1757,11 @@ def Test_expr7_list_vim9script()
17571757 enddef
17581758 var list = [Failing]
17591759 END
1760- CheckScriptFailure (lines , ' E119:' , 1 )
1760+ if has (' channel' )
1761+ CheckScriptFailure (lines , ' E119:' , 1 )
1762+ else
1763+ CheckScriptFailure (lines , ' E117:' , 1 )
1764+ endif
17611765enddef
17621766
17631767def LambdaWithComments (): func
@@ -2028,7 +2032,11 @@ def Test_expr7_dict_vim9script()
20282032 enddef
20292033 var dict = #{name: Failing}
20302034 END
2031- CheckScriptFailure (lines , ' E119:' , 1 )
2035+ if has (' channel' )
2036+ CheckScriptFailure (lines , ' E119:' , 1 )
2037+ else
2038+ CheckScriptFailure (lines , ' E117:' , 1 )
2039+ endif
20322040enddef
20332041
20342042let g: oneString = ' one'
0 commit comments