Mercurial > vim
comparison src/testdir/test_vim9_assign.vim @ 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 | 685909aa5641 |
children | 166a0f17b05e |
comparison
equal
deleted
inserted
replaced
22432:3e2826aeca3b | 22433:8b5e2f9580db |
---|---|
56 CheckDefAndScriptFailure(['var x: bool = {}'], 'E1012:') | 56 CheckDefAndScriptFailure(['var x: bool = {}'], 'E1012:') |
57 CheckDefAndScriptFailure(['var x: bool = "x"'], 'E1012:') | 57 CheckDefAndScriptFailure(['var x: bool = "x"'], 'E1012:') |
58 enddef | 58 enddef |
59 | 59 |
60 def Test_syntax() | 60 def Test_syntax() |
61 var var = 234 | 61 var name = 234 |
62 var other: list<string> = ['asdf'] | 62 var other: list<string> = ['asdf'] |
63 enddef | 63 enddef |
64 | 64 |
65 def Test_assignment() | 65 def Test_assignment() |
66 CheckDefFailure(['var x:string'], 'E1069:') | 66 CheckDefFailure(['var x:string'], 'E1069:') |
526 var lines =<< trim END | 526 var lines =<< trim END |
527 vim9script | 527 vim9script |
528 def Func(): list<number> | 528 def Func(): list<number> |
529 return [1, 2] | 529 return [1, 2] |
530 enddef | 530 enddef |
531 var var1: number | 531 var name1: number |
532 var var2: number | 532 var name2: number |
533 [var1, var2] = | 533 [name1, name2] = |
534 Func() | 534 Func() |
535 assert_equal(1, var1) | 535 assert_equal(1, name1) |
536 assert_equal(2, var2) | 536 assert_equal(2, name2) |
537 var ll = | 537 var ll = |
538 Func() | 538 Func() |
539 assert_equal([1, 2], ll) | 539 assert_equal([1, 2], ll) |
540 | 540 |
541 @/ = 'text' | 541 @/ = 'text' |
583 v:foldstart = 123 | 583 v:foldstart = 123 |
584 return 'xxx' | 584 return 'xxx' |
585 enddef | 585 enddef |
586 | 586 |
587 def Test_assignment_failure() | 587 def Test_assignment_failure() |
588 CheckDefFailure(['var var=234'], 'E1004:') | 588 CheckDefFailure(['var name=234'], 'E1004:') |
589 CheckDefFailure(['var var =234'], 'E1004:') | 589 CheckDefFailure(['var name =234'], 'E1004:') |
590 CheckDefFailure(['var var= 234'], 'E1004:') | 590 CheckDefFailure(['var name= 234'], 'E1004:') |
591 | 591 |
592 CheckScriptFailure(['vim9script', 'var var=234'], 'E1004:') | 592 CheckScriptFailure(['vim9script', 'var name=234'], 'E1004:') |
593 CheckScriptFailure(['vim9script', 'var var=234'], "before and after '='") | 593 CheckScriptFailure(['vim9script', 'var name=234'], "before and after '='") |
594 CheckScriptFailure(['vim9script', 'var var =234'], 'E1004:') | 594 CheckScriptFailure(['vim9script', 'var name =234'], 'E1004:') |
595 CheckScriptFailure(['vim9script', 'var var= 234'], 'E1004:') | 595 CheckScriptFailure(['vim9script', 'var name= 234'], 'E1004:') |
596 CheckScriptFailure(['vim9script', 'var var = 234', 'var+=234'], 'E1004:') | 596 CheckScriptFailure(['vim9script', 'var name = 234', 'name+=234'], 'E1004:') |
597 CheckScriptFailure(['vim9script', 'var var = 234', 'var+=234'], "before and after '+='") | 597 CheckScriptFailure(['vim9script', 'var name = 234', 'name+=234'], "before and after '+='") |
598 CheckScriptFailure(['vim9script', 'var var = "x"', 'var..="y"'], 'E1004:') | 598 CheckScriptFailure(['vim9script', 'var name = "x"', 'name..="y"'], 'E1004:') |
599 CheckScriptFailure(['vim9script', 'var var = "x"', 'var..="y"'], "before and after '..='") | 599 CheckScriptFailure(['vim9script', 'var name = "x"', 'name..="y"'], "before and after '..='") |
600 | 600 |
601 CheckDefFailure(['var true = 1'], 'E1034:') | 601 CheckDefFailure(['var true = 1'], 'E1034:') |
602 CheckDefFailure(['var false = 1'], 'E1034:') | 602 CheckDefFailure(['var false = 1'], 'E1034:') |
603 | 603 |
604 CheckDefFailure(['[a; b; c] = g:list'], 'E452:') | 604 CheckDefFailure(['[a; b; c] = g:list'], 'E452:') |
643 CheckDefFailure(["var xnr = xnr + 1"], 'E1001:', 1) | 643 CheckDefFailure(["var xnr = xnr + 1"], 'E1001:', 1) |
644 CheckScriptFailure(['vim9script', 'var xnr = xnr + 4'], 'E121:') | 644 CheckScriptFailure(['vim9script', 'var xnr = xnr + 4'], 'E121:') |
645 | 645 |
646 CheckScriptFailure(['vim9script', 'def Func()', 'var dummy = s:notfound', 'enddef', 'defcompile'], 'E1108:') | 646 CheckScriptFailure(['vim9script', 'def Func()', 'var dummy = s:notfound', 'enddef', 'defcompile'], 'E1108:') |
647 | 647 |
648 CheckDefFailure(['var var: list<string> = [123]'], 'expected list<string> but got list<number>') | 648 CheckDefFailure(['var name: list<string> = [123]'], 'expected list<string> but got list<number>') |
649 CheckDefFailure(['var var: list<number> = ["xx"]'], 'expected list<number> but got list<string>') | 649 CheckDefFailure(['var name: list<number> = ["xx"]'], 'expected list<number> but got list<string>') |
650 | 650 |
651 CheckDefFailure(['var var: dict<string> = #{key: 123}'], 'expected dict<string> but got dict<number>') | 651 CheckDefFailure(['var name: dict<string> = #{key: 123}'], 'expected dict<string> but got dict<number>') |
652 CheckDefFailure(['var var: dict<number> = #{key: "xx"}'], 'expected dict<number> but got dict<string>') | 652 CheckDefFailure(['var name: dict<number> = #{key: "xx"}'], 'expected dict<number> but got dict<string>') |
653 | 653 |
654 CheckDefFailure(['var var = feedkeys("0")'], 'E1031:') | 654 CheckDefFailure(['var name = feedkeys("0")'], 'E1031:') |
655 CheckDefFailure(['var var: number = feedkeys("0")'], 'expected number but got void') | 655 CheckDefFailure(['var name: number = feedkeys("0")'], 'expected number but got void') |
656 | 656 |
657 CheckDefFailure(['var var: dict <number>'], 'E1068:') | 657 CheckDefFailure(['var name: dict <number>'], 'E1068:') |
658 CheckDefFailure(['var var: dict<number'], 'E1009:') | 658 CheckDefFailure(['var name: dict<number'], 'E1009:') |
659 | 659 |
660 assert_fails('s/^/\=Mess()/n', 'E794:') | 660 assert_fails('s/^/\=Mess()/n', 'E794:') |
661 CheckDefFailure(['var var: dict<number'], 'E1009:') | 661 CheckDefFailure(['var name: dict<number'], 'E1009:') |
662 | 662 |
663 CheckDefFailure(['w:foo: number = 10'], | 663 CheckDefFailure(['w:foo: number = 10'], |
664 'E488: Trailing characters: : number = 1') | 664 'E488: Trailing characters: : number = 1') |
665 CheckDefFailure(['t:foo: bool = true'], | 665 CheckDefFailure(['t:foo: bool = true'], |
666 'E488: Trailing characters: : bool = true') | 666 'E488: Trailing characters: : bool = true') |