Patch 8.2.1765

[Bram Moolenaar]

Patch 8.2.1765
Problem: Vim9: some tests use "var var".
Solution: Use "var name". (closes #7032)
Files: src/testdir/test_vim9_assign.vim, src/testdir/test_vim9_expr.vim


*** ../vim-8.2.1764/src/testdir/test_vim9_assign.vim 2020-09-27 21:27:36.490544195 +0200
--- src/testdir/test_vim9_assign.vim 2020-09-27 21:54:47.589723189 +0200
***************
*** 58,64 ****
enddef

def Test_syntax()
! var var = 234
var other: list<string> = ['asdf']
enddef

--- 58,64 ----
enddef

def Test_syntax()
! var name = 234
var other: list<string> = ['asdf']
enddef

***************
*** 528,539 ****
def Func(): list<number>
return [1, 2]
enddef
! var var1: number
! var var2: number
! [var1, var2] =
Func()
! assert_equal(1, var1)
! assert_equal(2, var2)
var ll =
Func()
assert_equal([1, 2], ll)
--- 528,539 ----
def Func(): list<number>
return [1, 2]
enddef
! var name1: number
! var name2: number
! [name1, name2] =
Func()
! assert_equal(1, name1)
! assert_equal(2, name2)
var ll =
Func()
assert_equal([1, 2], ll)
***************
*** 585,602 ****
enddef

def Test_assignment_failure()
! CheckDefFailure(['var var=234'], 'E1004:')
! CheckDefFailure(['var var =234'], 'E1004:')
! CheckDefFailure(['var var= 234'], 'E1004:')
!
! CheckScriptFailure(['vim9script', 'var var=234'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var var=234'], "before and after '='")
! CheckScriptFailure(['vim9script', 'var var =234'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var var= 234'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var var = 234', 'var+=234'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var var = 234', 'var+=234'], "before and after '+='")
! CheckScriptFailure(['vim9script', 'var var = "x"', 'var..="y"'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var var = "x"', 'var..="y"'], "before and after '..='")

CheckDefFailure(['var true = 1'], 'E1034:')
CheckDefFailure(['var false = 1'], 'E1034:')
--- 585,602 ----
enddef

def Test_assignment_failure()
! CheckDefFailure(['var name=234'], 'E1004:')
! CheckDefFailure(['var name =234'], 'E1004:')
! CheckDefFailure(['var name= 234'], 'E1004:')
!
! CheckScriptFailure(['vim9script', 'var name=234'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var name=234'], "before and after '='")
! CheckScriptFailure(['vim9script', 'var name =234'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var name= 234'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var name = 234', 'name+=234'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var name = 234', 'name+=234'], "before and after '+='")
! CheckScriptFailure(['vim9script', 'var name = "x"', 'name..="y"'], 'E1004:')
! CheckScriptFailure(['vim9script', 'var name = "x"', 'name..="y"'], "before and after '..='")

CheckDefFailure(['var true = 1'], 'E1034:')
CheckDefFailure(['var false = 1'], 'E1034:')
***************
*** 645,664 ****

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 var: 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 var: dict<number> = #{key: "xx"}'], 'expected dict<number> but got dict<string>')

! CheckDefFailure(['var var = feedkeys("0")'], 'E1031:')
! CheckDefFailure(['var var: number = feedkeys("0")'], 'expected number but got void')

! CheckDefFailure(['var var: dict <number>'], 'E1068:')
! CheckDefFailure(['var var: dict<number'], 'E1009:')

assert_fails('s/^/\=Mess()/n', 'E794:')
! CheckDefFailure(['var var: dict<number'], 'E1009:')

CheckDefFailure(['w:foo: number = 10'],
'E488: Trailing characters: : number = 1')
--- 645,664 ----

CheckScriptFailure(['vim9script', 'def Func()', 'var dummy = s:notfound', 'enddef', 'defcompile'], 'E1108:')

! CheckDefFailure(['var name: list<string> = [123]'], 'expected list<string> but got list<number>')
! CheckDefFailure(['var name: list<number> = ["xx"]'], 'expected list<number> but got list<string>')

! CheckDefFailure(['var name: dict<string> = #{key: 123}'], 'expected dict<string> but got dict<number>')
! CheckDefFailure(['var name: dict<number> = #{key: "xx"}'], 'expected dict<number> but got dict<string>')

! CheckDefFailure(['var name = feedkeys("0")'], 'E1031:')
! CheckDefFailure(['var name: number = feedkeys("0")'], 'expected number but got void')

! CheckDefFailure(['var name: dict <number>'], 'E1068:')
! CheckDefFailure(['var name: dict<number'], 'E1009:')

assert_fails('s/^/\=Mess()/n', 'E794:')
! CheckDefFailure(['var name: dict<number'], 'E1009:')

CheckDefFailure(['w:foo: number = 10'],
'E488: Trailing characters: : number = 1')
*** ../vim-8.2.1764/src/testdir/test_vim9_expr.vim 2020-09-27 17:57:39.508086116 +0200
--- src/testdir/test_vim9_expr.vim 2020-09-27 21:54:47.589723189 +0200
***************
*** 68,122 ****
# check line continuation
var lines =<< trim END
vim9script
! var var = 1
? 'yes'
: 'no'
! assert_equal('yes', var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = v:false
? 'yes'
: 'no'
! assert_equal('no', var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = v:false ?
'yes' :
'no'
! assert_equal('no', var)
END
CheckScriptSuccess(lines)

# check white space
lines =<< trim END
vim9script
! var var = v:true?1:2
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var var = v:true? 1 : 2
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var var = v:true ?1 : 2
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var var = v:true ? 1: 2
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var var = v:true ? 1 :2
END
CheckScriptFailure(lines, 'E1004:', 2)

--- 68,122 ----
# check line continuation
var lines =<< trim END
vim9script
! var name = 1
? 'yes'
: 'no'
! assert_equal('yes', name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = v:false
? 'yes'
: 'no'
! assert_equal('no', name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = v:false ?
'yes' :
'no'
! assert_equal('no', name)
END
CheckScriptSuccess(lines)

# check white space
lines =<< trim END
vim9script
! var name = v:true?1:2
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var name = v:true? 1 : 2
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var name = v:true ?1 : 2
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var name = v:true ? 1: 2
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var name = v:true ? 1 :2
END
CheckScriptFailure(lines, 'E1004:', 2)

***************
*** 203,246 ****
# check line continuation
var lines =<< trim END
vim9script
! var var = 0
|| 1
! assert_equal(1, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = v:false
|| v:true
|| v:false
! assert_equal(v:true, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = v:false ||
v:true ||
v:false
! assert_equal(v:true, var)
END
CheckScriptSuccess(lines)

# check white space
lines =<< trim END
vim9script
! var var = v:true||v:true
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var var = v:true ||v:true
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var var = v:true|| v:true
END
CheckScriptFailure(lines, 'E1004:', 2)

--- 203,246 ----
# check line continuation
var lines =<< trim END
vim9script
! var name = 0
|| 1
! assert_equal(1, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = v:false
|| v:true
|| v:false
! assert_equal(v:true, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = v:false ||
v:true ||
v:false
! assert_equal(v:true, name)
END
CheckScriptSuccess(lines)

# check white space
lines =<< trim END
vim9script
! var name = v:true||v:true
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var name = v:true ||v:true
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var name = v:true|| v:true
END
CheckScriptFailure(lines, 'E1004:', 2)

***************
*** 324,367 ****
# check line continuation
var lines =<< trim END
vim9script
! var var = 0
&& 1
! assert_equal(0, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = v:true
&& v:true
&& v:true
! assert_equal(v:true, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = v:true &&
v:true &&
v:true
! assert_equal(v:true, var)
END
CheckScriptSuccess(lines)

# check white space
lines =<< trim END
vim9script
! var var = v:true&&v:true
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var var = v:true &&v:true
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var var = v:true&& v:true
END
CheckScriptFailure(lines, 'E1004:', 2)

--- 324,367 ----
# check line continuation
var lines =<< trim END
vim9script
! var name = 0
&& 1
! assert_equal(0, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = v:true
&& v:true
&& v:true
! assert_equal(v:true, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = v:true &&
v:true &&
v:true
! assert_equal(v:true, name)
END
CheckScriptSuccess(lines)

# check white space
lines =<< trim END
vim9script
! var name = v:true&&v:true
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var name = v:true &&v:true
END
CheckScriptFailure(lines, 'E1004:', 2)
lines =<< trim END
vim9script
! var name = v:true&& v:true
END
CheckScriptFailure(lines, 'E1004:', 2)

***************
*** 738,762 ****
# check line continuation
var lines =<< trim END
vim9script
! var var = 0
< 1
! assert_equal(true, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = 123
!= 123
! assert_equal(false, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = 123 ==
123
! assert_equal(true, var)
END
CheckScriptSuccess(lines)

--- 738,762 ----
# check line continuation
var lines =<< trim END
vim9script
! var name = 0
< 1
! assert_equal(true, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = 123
!= 123
! assert_equal(false, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = 123 ==
123
! assert_equal(true, name)
END
CheckScriptSuccess(lines)

***************
*** 988,1014 ****
# check line continuation
var lines =<< trim END
vim9script
! var var = 11
+ 77
- 22
! assert_equal(66, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = 11 +
77 -
22
! assert_equal(66, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = 'one'
.. 'two'
! assert_equal('onetwo', var)
END
CheckScriptSuccess(lines)

--- 988,1014 ----
# check line continuation
var lines =<< trim END
vim9script
! var name = 11
+ 77
- 22
! assert_equal(66, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = 11 +
77 -
22
! assert_equal(66, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = 'one'
.. 'two'
! assert_equal('onetwo', name)
END
CheckScriptSuccess(lines)

***************
*** 1235,1261 ****
# check line continuation
var lines =<< trim END
vim9script
! var var = 11
* 22
/ 3
! assert_equal(80, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = 25
% 10
! assert_equal(5, var)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var var = 11 *
22 /
3
! assert_equal(80, var)
END
CheckScriptSuccess(lines)

--- 1235,1261 ----
# check line continuation
var lines =<< trim END
vim9script
! var name = 11
* 22
/ 3
! assert_equal(80, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = 25
% 10
! assert_equal(5, name)
END
CheckScriptSuccess(lines)

lines =<< trim END
vim9script
! var name = 11 *
22 /
3
! assert_equal(80, name)
END
CheckScriptSuccess(lines)

*** ../vim-8.2.1764/src/version.c 2020-09-27 21:27:36.490544195 +0200
--- src/version.c 2020-09-27 21:55:48.129547809 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 1765,
/**/

--
Everybody wants to go to heaven, but nobody wants to die.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///