aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.2.1765: Vim9: some tests use "var var"

Browse Source 
Problem:    Vim9: some tests use "var var".
Solution:   Use "var name". (closes #7032)
This commit is contained in:
Bram Moolenaar
2020-09-27 21:58:45 +02:00
parent 06f9c6940a
commit 9830938e77
3 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/testdir/test_vim9_assign.vim
View File

@@ -58,7 +58,7 @@ def Test_assignment_bool()
enddef enddef
def Test_syntax() def Test_syntax()
var var = 234 var name = 234
var other: list<string> = ['asdf'] var other: list<string> = ['asdf']
enddef enddef
@@ -528,12 +528,12 @@ def Test_assignment_vim9script()
def Func(): list<number> def Func(): list<number>
return [1, 2] return [1, 2]
enddef enddef
var var1: number var name1: number
var var2: number var name2: number
[var1, var2] = [name1, name2] =
Func() Func()
assert_equal(1, var1) assert_equal(1, name1)
assert_equal(2, var2) assert_equal(2, name2)
var ll = var ll =
Func() Func()
assert_equal([1, 2], ll) assert_equal([1, 2], ll)
@@ -585,18 +585,18 @@ def Mess(): string
enddef enddef
def Test_assignment_failure() def Test_assignment_failure()
CheckDefFailure(['var var=234'], 'E1004:') CheckDefFailure(['var name=234'], 'E1004:')
CheckDefFailure(['var var =234'], 'E1004:') CheckDefFailure(['var name =234'], 'E1004:')
CheckDefFailure(['var var= 234'], 'E1004:') CheckDefFailure(['var name= 234'], 'E1004:')
CheckScriptFailure(['vim9script', 'var var=234'], 'E1004:') CheckScriptFailure(['vim9script', 'var name=234'], 'E1004:')
CheckScriptFailure(['vim9script', 'var var=234'], "before and after '='") CheckScriptFailure(['vim9script', 'var name=234'], "before and after '='")
CheckScriptFailure(['vim9script', 'var var =234'], 'E1004:') CheckScriptFailure(['vim9script', 'var name =234'], 'E1004:')
CheckScriptFailure(['vim9script', 'var var= 234'], 'E1004:') CheckScriptFailure(['vim9script', 'var name= 234'], 'E1004:')
CheckScriptFailure(['vim9script', 'var var = 234', 'var+=234'], 'E1004:') CheckScriptFailure(['vim9script', 'var name = 234', 'name+=234'], 'E1004:')
CheckScriptFailure(['vim9script', 'var var = 234', 'var+=234'], "before and after '+='") CheckScriptFailure(['vim9script', 'var name = 234', 'name+=234'], "before and after '+='")
CheckScriptFailure(['vim9script', 'var var = "x"', 'var..="y"'], 'E1004:') CheckScriptFailure(['vim9script', 'var name = "x"', 'name..="y"'], 'E1004:')
CheckScriptFailure(['vim9script', 'var var = "x"', 'var..="y"'], "before and after '..='") CheckScriptFailure(['vim9script', 'var name = "x"', 'name..="y"'], "before and after '..='")
CheckDefFailure(['var true = 1'], 'E1034:') CheckDefFailure(['var true = 1'], 'E1034:')
CheckDefFailure(['var false = 1'], 'E1034:') CheckDefFailure(['var false = 1'], 'E1034:')
@@ -645,20 +645,20 @@ def Test_assignment_failure()
CheckScriptFailure(['vim9script', 'def Func()', 'var dummy = s:notfound', 'enddef', 'defcompile'], 'E1108:') CheckScriptFailure(['vim9script', 'def Func()', 'var dummy = s:notfound', 'enddef', 'defcompile'], 'E1108:')
CheckDefFailure(['var var: list<string> = [123]'], 'expected list<string> but got list<number>') CheckDefFailure(['var name: list<string> = [123]'], 'expected list<string> but got list<number>')
CheckDefFailure(['var var: list<number> = ["xx"]'], 'expected list<number> but got list<string>') CheckDefFailure(['var name: list<number> = ["xx"]'], 'expected list<number> but got list<string>')
CheckDefFailure(['var var: dict<string> = #{key: 123}'], 'expected dict<string> but got dict<number>') CheckDefFailure(['var name: dict<string> = #{key: 123}'], 'expected dict<string> but got dict<number>')
CheckDefFailure(['var var: dict<number> = #{key: "xx"}'], 'expected dict<number> but got dict<string>') CheckDefFailure(['var name: dict<number> = #{key: "xx"}'], 'expected dict<number> but got dict<string>')
CheckDefFailure(['var var = feedkeys("0")'], 'E1031:') CheckDefFailure(['var name = feedkeys("0")'], 'E1031:')
CheckDefFailure(['var var: number = feedkeys("0")'], 'expected number but got void') CheckDefFailure(['var name: number = feedkeys("0")'], 'expected number but got void')
CheckDefFailure(['var var: dict <number>'], 'E1068:') CheckDefFailure(['var name: dict <number>'], 'E1068:')
CheckDefFailure(['var var: dict<number'], 'E1009:') CheckDefFailure(['var name: dict<number'], 'E1009:')
assert_fails('s/^/\=Mess()/n', 'E794:') assert_fails('s/^/\=Mess()/n', 'E794:')
CheckDefFailure(['var var: dict<number'], 'E1009:') CheckDefFailure(['var name: dict<number'], 'E1009:')
CheckDefFailure(['w:foo: number = 10'], CheckDefFailure(['w:foo: number = 10'],
'E488: Trailing characters: : number = 1') 'E488: Trailing characters: : number = 1')

94
src/testdir/test_vim9_expr.vim
View File

@@ -68,55 +68,55 @@ def Test_expr1_vimscript()
# check line continuation # check line continuation
var lines =<< trim END var lines =<< trim END
vim9script vim9script
var var = 1 var name = 1
? 'yes' ? 'yes'
: 'no' : 'no'
assert_equal('yes', var) assert_equal('yes', name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:false var name = v:false
? 'yes' ? 'yes'
: 'no' : 'no'
assert_equal('no', var) assert_equal('no', name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:false ? var name = v:false ?
'yes' : 'yes' :
'no' 'no'
assert_equal('no', var) assert_equal('no', name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
# check white space # check white space
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true?1:2 var name = v:true?1:2
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true? 1 : 2 var name = v:true? 1 : 2
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true ?1 : 2 var name = v:true ?1 : 2
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true ? 1: 2 var name = v:true ? 1: 2
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true ? 1 :2 var name = v:true ? 1 :2
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
@@ -203,44 +203,44 @@ def Test_expr2_vimscript()
# check line continuation # check line continuation
var lines =<< trim END var lines =<< trim END
vim9script vim9script
var var = 0 var name = 0
|| 1 || 1
assert_equal(1, var) assert_equal(1, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:false var name = v:false
|| v:true || v:true
|| v:false || v:false
assert_equal(v:true, var) assert_equal(v:true, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:false || var name = v:false ||
v:true || v:true ||
v:false v:false
assert_equal(v:true, var) assert_equal(v:true, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
# check white space # check white space
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true||v:true var name = v:true||v:true
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true ||v:true var name = v:true ||v:true
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true|| v:true var name = v:true|| v:true
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
@@ -324,44 +324,44 @@ def Test_expr3_vimscript()
# check line continuation # check line continuation
var lines =<< trim END var lines =<< trim END
vim9script vim9script
var var = 0 var name = 0
&& 1 && 1
assert_equal(0, var) assert_equal(0, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true var name = v:true
&& v:true && v:true
&& v:true && v:true
assert_equal(v:true, var) assert_equal(v:true, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true && var name = v:true &&
v:true && v:true &&
v:true v:true
assert_equal(v:true, var) assert_equal(v:true, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
# check white space # check white space
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true&&v:true var name = v:true&&v:true
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true &&v:true var name = v:true &&v:true
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = v:true&& v:true var name = v:true&& v:true
END END
CheckScriptFailure(lines, 'E1004:', 2) CheckScriptFailure(lines, 'E1004:', 2)
@@ -738,25 +738,25 @@ def Test_expr4_vim9script()
# check line continuation # check line continuation
var lines =<< trim END var lines =<< trim END
vim9script vim9script
var var = 0 var name = 0
< 1 < 1
assert_equal(true, var) assert_equal(true, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = 123 var name = 123
!= 123 != 123
assert_equal(false, var) assert_equal(false, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = 123 == var name = 123 ==
123 123
assert_equal(true, var) assert_equal(true, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
@@ -988,27 +988,27 @@ def Test_expr5_vim9script()
# check line continuation # check line continuation
var lines =<< trim END var lines =<< trim END
vim9script vim9script
var var = 11 var name = 11
+ 77 + 77
- 22 - 22
assert_equal(66, var) assert_equal(66, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = 11 + var name = 11 +
77 - 77 -
22 22
assert_equal(66, var) assert_equal(66, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = 'one' var name = 'one'
.. 'two' .. 'two'
assert_equal('onetwo', var) assert_equal('onetwo', name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
@@ -1235,27 +1235,27 @@ def Test_expr6_vim9script()
# check line continuation # check line continuation
var lines =<< trim END var lines =<< trim END
vim9script vim9script
var var = 11 var name = 11
* 22 * 22
/ 3 / 3
assert_equal(80, var) assert_equal(80, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = 25 var name = 25
% 10 % 10
assert_equal(5, var) assert_equal(5, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
lines =<< trim END lines =<< trim END
vim9script vim9script
var var = 11 * var name = 11 *
22 / 22 /
3 3
assert_equal(80, var) assert_equal(80, name)
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1765,
/**/ /**/
1764, 1764,
/**/ /**/