Mercurial > vim
changeset 22433:8b5e2f9580db v8.2.1765
patch 8.2.1765: Vim9: some tests use "var var"
Commit: https://github.com/vim/vim/commit/9830938e77b0d36d65b0c31eadf09f7b9d394c29
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 27 21:58:45 2020 +0200
patch 8.2.1765: Vim9: some tests use "var var"
Problem: Vim9: some tests use "var var".
Solution: Use "var name". (closes https://github.com/vim/vim/issues/7032)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 27 Sep 2020 22:00:03 +0200 |
| parents | 3e2826aeca3b |
| children | 70f3df42437e |
| files | src/testdir/test_vim9_assign.vim src/testdir/test_vim9_expr.vim src/version.c |
| diffstat | 3 files changed, 75 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -58,7 +58,7 @@ def Test_assignment_bool() enddef def Test_syntax() - var var = 234 + var name = 234 var other: list<string> = ['asdf'] enddef @@ -528,12 +528,12 @@ def Test_assignment_vim9script() def Func(): list<number> return [1, 2] enddef - var var1: number - var var2: number - [var1, var2] = + var name1: number + var name2: number + [name1, name2] = Func() - assert_equal(1, var1) - assert_equal(2, var2) + assert_equal(1, name1) + assert_equal(2, name2) var ll = Func() assert_equal([1, 2], ll) @@ -585,18 +585,18 @@ def Mess(): string enddef def Test_assignment_failure() - CheckDefFailure(['var var=234'], 'E1004:') - CheckDefFailure(['var var =234'], 'E1004:') - CheckDefFailure(['var var= 234'], 'E1004:') + CheckDefFailure(['var name=234'], 'E1004:') + CheckDefFailure(['var name =234'], 'E1004:') + CheckDefFailure(['var name= 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 '..='") + 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,20 +645,20 @@ def Test_assignment_failure() 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 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 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 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 var = feedkeys("0")'], 'E1031:') - CheckDefFailure(['var var: number = feedkeys("0")'], 'expected number but got void') + CheckDefFailure(['var name = feedkeys("0")'], 'E1031:') + CheckDefFailure(['var name: number = feedkeys("0")'], 'expected number but got void') - CheckDefFailure(['var var: dict <number>'], 'E1068:') - CheckDefFailure(['var var: dict<number'], 'E1009:') + CheckDefFailure(['var name: dict <number>'], 'E1068:') + CheckDefFailure(['var name: dict<number'], 'E1009:') assert_fails('s/^/\=Mess()/n', 'E794:') - CheckDefFailure(['var var: dict<number'], 'E1009:') + CheckDefFailure(['var name: dict<number'], 'E1009:') CheckDefFailure(['w:foo: number = 10'], 'E488: Trailing characters: : number = 1')
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -68,55 +68,55 @@ def Test_expr1_vimscript() # check line continuation var lines =<< trim END vim9script - var var = 1 + var name = 1 ? 'yes' : 'no' - assert_equal('yes', var) + assert_equal('yes', name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = v:false + var name = v:false ? 'yes' : 'no' - assert_equal('no', var) + assert_equal('no', name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = v:false ? + var name = v:false ? 'yes' : 'no' - assert_equal('no', var) + assert_equal('no', name) END CheckScriptSuccess(lines) # check white space lines =<< trim END vim9script - var var = v:true?1:2 + var name = v:true?1:2 END CheckScriptFailure(lines, 'E1004:', 2) lines =<< trim END vim9script - var var = v:true? 1 : 2 + var name = v:true? 1 : 2 END CheckScriptFailure(lines, 'E1004:', 2) lines =<< trim END vim9script - var var = v:true ?1 : 2 + var name = v:true ?1 : 2 END CheckScriptFailure(lines, 'E1004:', 2) lines =<< trim END vim9script - var var = v:true ? 1: 2 + var name = v:true ? 1: 2 END CheckScriptFailure(lines, 'E1004:', 2) lines =<< trim END vim9script - var var = v:true ? 1 :2 + var name = v:true ? 1 :2 END CheckScriptFailure(lines, 'E1004:', 2) @@ -203,44 +203,44 @@ def Test_expr2_vimscript() # check line continuation var lines =<< trim END vim9script - var var = 0 + var name = 0 || 1 - assert_equal(1, var) + assert_equal(1, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = v:false + var name = v:false || v:true || v:false - assert_equal(v:true, var) + assert_equal(v:true, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = v:false || + var name = v:false || v:true || v:false - assert_equal(v:true, var) + assert_equal(v:true, name) END CheckScriptSuccess(lines) # check white space lines =<< trim END vim9script - var var = v:true||v:true + var name = v:true||v:true END CheckScriptFailure(lines, 'E1004:', 2) lines =<< trim END vim9script - var var = v:true ||v:true + var name = v:true ||v:true END CheckScriptFailure(lines, 'E1004:', 2) lines =<< trim END vim9script - var var = v:true|| v:true + var name = v:true|| v:true END CheckScriptFailure(lines, 'E1004:', 2) @@ -324,44 +324,44 @@ def Test_expr3_vimscript() # check line continuation var lines =<< trim END vim9script - var var = 0 + var name = 0 && 1 - assert_equal(0, var) + assert_equal(0, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = v:true + var name = v:true && v:true && v:true - assert_equal(v:true, var) + assert_equal(v:true, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = v:true && + var name = v:true && v:true && v:true - assert_equal(v:true, var) + assert_equal(v:true, name) END CheckScriptSuccess(lines) # check white space lines =<< trim END vim9script - var var = v:true&&v:true + var name = v:true&&v:true END CheckScriptFailure(lines, 'E1004:', 2) lines =<< trim END vim9script - var var = v:true &&v:true + var name = v:true &&v:true END CheckScriptFailure(lines, 'E1004:', 2) lines =<< trim END vim9script - var var = v:true&& v:true + var name = v:true&& v:true END CheckScriptFailure(lines, 'E1004:', 2) @@ -738,25 +738,25 @@ def Test_expr4_vim9script() # check line continuation var lines =<< trim END vim9script - var var = 0 + var name = 0 < 1 - assert_equal(true, var) + assert_equal(true, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = 123 + var name = 123 != 123 - assert_equal(false, var) + assert_equal(false, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = 123 == + var name = 123 == 123 - assert_equal(true, var) + assert_equal(true, name) END CheckScriptSuccess(lines) @@ -988,27 +988,27 @@ def Test_expr5_vim9script() # check line continuation var lines =<< trim END vim9script - var var = 11 + var name = 11 + 77 - 22 - assert_equal(66, var) + assert_equal(66, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = 11 + + var name = 11 + 77 - 22 - assert_equal(66, var) + assert_equal(66, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = 'one' + var name = 'one' .. 'two' - assert_equal('onetwo', var) + assert_equal('onetwo', name) END CheckScriptSuccess(lines) @@ -1235,27 +1235,27 @@ def Test_expr6_vim9script() # check line continuation var lines =<< trim END vim9script - var var = 11 + var name = 11 * 22 / 3 - assert_equal(80, var) + assert_equal(80, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = 25 + var name = 25 % 10 - assert_equal(5, var) + assert_equal(5, name) END CheckScriptSuccess(lines) lines =<< trim END vim9script - var var = 11 * + var name = 11 * 22 / 3 - assert_equal(80, var) + assert_equal(80, name) END CheckScriptSuccess(lines)