To: vim_dev@googlegroups.com Subject: Patch 8.2.1765 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ 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 = ['asdf'] enddef --- 58,64 ---- enddef def Test_syntax() ! var name = 234 var other: list = ['asdf'] enddef *************** *** 528,539 **** def Func(): list 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 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 = [123]'], 'expected list but got list') ! CheckDefFailure(['var var: list = ["xx"]'], 'expected list but got list') ! CheckDefFailure(['var var: dict = #{key: 123}'], 'expected dict but got dict') ! CheckDefFailure(['var var: dict = #{key: "xx"}'], 'expected dict but got dict') ! CheckDefFailure(['var var = feedkeys("0")'], 'E1031:') ! CheckDefFailure(['var var: number = feedkeys("0")'], 'expected number but got void') ! CheckDefFailure(['var var: dict '], 'E1068:') ! CheckDefFailure(['var var: dict = [123]'], 'expected list but got list') ! CheckDefFailure(['var name: list = ["xx"]'], 'expected list but got list') ! CheckDefFailure(['var name: dict = #{key: 123}'], 'expected dict but got dict') ! CheckDefFailure(['var name: dict = #{key: "xx"}'], 'expected dict but got dict') ! CheckDefFailure(['var name = feedkeys("0")'], 'E1031:') ! CheckDefFailure(['var name: number = feedkeys("0")'], 'expected number but got void') ! CheckDefFailure(['var name: dict '], 'E1068:') ! CheckDefFailure(['var name: dict