vim: src/testdir/test_vim9_expr.vim comparison

comparison src/testdir/test_vim9_expr.vim @ 27191:63f8dbcf6a74 v8.2.4124

patch 8.2.4124: Vim9: method in compiled function may not see script item Commit: https://github.com/vim/vim/commit/6389baa6691fde4ca56ec6243ed83322543df300 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jan 17 20:50:40 2022 +0000 patch 8.2.4124: Vim9: method in compiled function may not see script item Problem: Vim9: method in compiled function may not see script item. Solution: Make sure not to skip to the next line. (closes https://github.com/vim/vim/issues/9496)

author	Bram Moolenaar <Bram@vim.org>
date	Mon, 17 Jan 2022 22:00:03 +0100
parents	6af18c69c59d
children	d4f254d02d7c

comparison

equal deleted inserted replaced

-:19849ccc38a0
+:63f8dbcf6a74
 let g:dict_one = #{one: 1}
 let $TESTVAR = 'testvar'
 " type casts
-def Test_expr7t()
+def Test_expr7()
 var lines =<< trim END
 var ls: list<string> = ['a', <string>g:string_empty]
 var ln: list<number> = [<number>g:anint, <number>g:thefour]
 var nr = <number>234
 assert_equal(234, nr)
 CheckDefAndScriptFailure(["var x = <number >123"], 'E1068:', 1)
 CheckDefAndScriptFailure(["var x = <number 123"], 'E1104:', 1)
 enddef
 " test low level expression
-def Test_expr7_number()
+def Test_expr8_number()
 # number constant
 var lines =<< trim END
 assert_equal(0, 0)
 assert_equal(654, 0654)
 assert_equal(255, 0xff)
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_float()
+def Test_expr8_float()
 # float constant
 if !has('float')
 MissingFeature 'float'
 else
 var lines =<< trim END
 END
 CheckDefAndScriptSuccess(lines)
 endif
 enddef
-def Test_expr7_blob()
+def Test_expr8_blob()
 # blob constant
 var lines =<< trim END
 assert_equal(g:blob_empty, 0z)
 assert_equal(g:blob_one, 0z01)
 assert_equal(g:blob_long, 0z0102.0304)
 CheckDefAndScriptSuccess(lines)
 CheckDefAndScriptFailure(["var x = 0z123"], 'E973:', 1)
 enddef
-def Test_expr7_string()
+def Test_expr8_string()
 # string constant
 var lines =<< trim END
 assert_equal(g:string_empty, '')
 assert_equal(g:string_empty, "")
 assert_equal(g:string_short, 'x')
 CheckDefAndScriptFailure(['var x = "abc'], 'E114:', 1)
 CheckDefAndScriptFailure(["var x = 'abc"], 'E115:', 1)
 enddef
-def Test_expr7_vimvar()
+def Test_expr8_vimvar()
 v:errors = []
 var errs: list<string> = v:errors
 CheckDefFailure(['var errs: list<number> = v:errors'], 'E1012:')
 var old: list<string> = v:oldfiles
 exec "normal! afoo fo\<C-N>\<Esc>"
 CheckDefExecAndScriptFailure(["var old: dict<number> = v:completed_item"], 'E1012: Type mismatch; expected dict<number> but got dict<string>', 1)
 bwipe!
 enddef
-def Test_expr7_special()
+def Test_expr8_special()
 # special constant
 var lines =<< trim END
 assert_equal(g:special_true, true)
 assert_equal(g:special_false, false)
 assert_equal(g:special_true, v:true)
 CheckDefAndScriptFailure(['v:false = true'], 'E46:', 1)
 CheckDefAndScriptFailure(['v:null = 11'], 'E46:', 1)
 CheckDefAndScriptFailure(['v:none = 22'], 'E46:', 1)
 enddef
-def Test_expr7_list()
+def Test_expr8_list()
 # list
 var lines =<< trim END
 assert_equal(g:list_empty, [])
 assert_equal(g:list_empty, [  ])
 'E1004: White space required before and after '':'' at ":b]"', 4)
 CheckDefAndScriptFailure(lines + ['echo numbers[1: b]'], 'E1004:', 4)
 CheckDefAndScriptFailure(lines + ['echo numbers[a :b]'], 'E1004:', 4)
 enddef
-def Test_expr7_list_vim9script()
+def Test_expr8_list_vim9script()
 var lines =<< trim END
 var l = [
 		11,
 		22,
 		]
 # some comment
 ||
 x == 2
 enddef
-def Test_expr7_lambda()
+def Test_expr8_lambda()
 var lines =<< trim END
 var La = () => 'result'
 # comment
 assert_equal('result', La())
 assert_equal([1, 3, 5], [1, 2, 3]->map((key, val) => key + val))
 eval (name + 2) / 3
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_lambda_block()
+def Test_expr8_lambda_block()
 var lines =<< trim END
 var Func = (s: string): string => {
 return 'hello ' .. s
 }
 assert_equal('hello there', Func('there'))
 # some comment
 ||
 x == 2
 enddef
-def Test_expr7_new_lambda()
+def Test_expr8_new_lambda()
 var lines =<< trim END
 var La = () => 'result'
 assert_equal('result', La())
 assert_equal([1, 3, 5], [1, 2, 3]->map((key, val) => key + val))
 CheckDefAndScriptFailure(['var Fx = (a) => ({k1: 0,', ' k2 1})'], 'E720:', 2)
 CheckDefAndScriptFailure(['var Fx = (a) => [0', ' 1]'], 'E696:', 2)
 enddef
-def Test_expr7_lambda_vim9script()
+def Test_expr8_lambda_vim9script()
 var lines =<< trim END
 var v = 10->((a) =>
 	    a
 	      + 2
 )()
 ->mapnew((_, v) => synIDattr(v, 'name'))->len())
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_funcref()
+def Test_expr8_funcref()
 var lines =<< trim END
 def RetNumber(): number
 return 123
 enddef
 var FuncRef = RetNumber
 enddef
 let g:test_space_dict = {'': 'empty', ' ': 'space'}
 let g:test_hash_dict = #{one: 1, two: 2}
-def Test_expr7_dict()
+def Test_expr8_dict()
 # dictionary
 var lines =<< trim END
 assert_equal(g:dict_empty, {})
 assert_equal(g:dict_empty, {  })
 assert_equal(g:dict_one, {['one']: 1})
 CheckDefFailure(['var x = ({'], 'E723:', 2)
 CheckScriptFailure(['vim9script', 'var x = ({'], 'E723:', 2)
 CheckDefExecAndScriptFailure(['{}[getftype("file")]'], 'E716: Key not present in Dictionary: ""', 1)
 enddef
-def Test_expr7_dict_vim9script()
+def Test_expr8_dict_vim9script()
 var lines =<< trim END
 var d = {
 		['one']:
 		   1,
 		['two']: 2,
 assert_equal({x: 99}, s:)
 END
 CheckScriptSuccess(lines)
 enddef
-def Test_expr7_dict_in_block()
+def Test_expr8_dict_in_block()
 var lines =<< trim END
 vim9script
 command MyCommand {
 echo {
 k: 0, }
 delcommand MyCommand
 delcommand YourCommand
 enddef
-def Test_expr7_call_2bool()
+def Test_expr8_call_2bool()
 var lines =<< trim END
 vim9script
 def BrokenCall(nr: number, mode: bool, use: string): void
 assert_equal(3, nr)
 CheckDefAndScriptFailure(["var x = g:dict_one.#$!"], ['E1002:', 'E15:'], 1)
 CheckDefExecAndScriptFailure(["var d: dict<any>", "echo d['a']"], 'E716:', 2)
 CheckDefExecAndScriptFailure(["var d: dict<number>", "d = g:list_empty"], 'E1012: Type mismatch; expected dict<number> but got list<unknown>', 2)
 enddef
-def Test_expr7_any_index_slice()
+def Test_expr8_any_index_slice()
 var lines =<< trim END
 # getting the one member should clear the list only after getting the item
 assert_equal('bbb', ['aaa', 'bbb', 'ccc'][1])
 # string is permissive, index out of range accepted
 def SetSomeVar()
 b:someVar = &fdm
 enddef
-def Test_expr7_option()
+def Test_expr8_option()
 var lines =<< trim END
 # option
 set ts=11
 assert_equal(11, &ts)
 &ts = 9
 unlet b:someVar
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_environment()
+def Test_expr8_environment()
 var lines =<< trim END
 # environment variable
 assert_equal('testvar', $TESTVAR)
 assert_equal('', $ASDF_ASD_XXX)
 END
 CheckDefAndScriptFailure(["var x = $$$"], ['E1002:', 'E15:'], 1)
 CheckDefAndScriptFailure(["$"], ['E1002:', 'E15:'], 1)
 enddef
-def Test_expr7_register()
+def Test_expr8_register()
 var lines =<< trim END
 @a = 'register a'
 assert_equal('register a', @a)
 var fname = expand('%')
 CheckDefAndScriptFailure(["@. = 'yes'"], ['E354:', 'E488:'], 1)
 enddef
 " This is slow when run under valgrind.
-def Test_expr7_namespace()
+def Test_expr8_namespace()
 var lines =<< trim END
 g:some_var = 'some'
 assert_equal('some', get(g:, 'some_var'))
 assert_equal('some', get(g:, 'some_var', 'xxx'))
 assert_equal('xxx', get(g:, 'no_var', 'xxx'))
 unlet t:some_var
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_namespace_loop_def()
+def Test_expr8_namespace_loop_def()
 var lines =<< trim END
 # check using g: in a for loop more than DO_NOT_FREE_CNT times
 var exists = 0
 var exists_not = 0
 for i in range(100000)
 END
 CheckDefSuccess(lines)
 enddef
 " NOTE: this is known to be slow.  To skip use:
-"   :let $TEST_SKIP_PAT = 'Test_expr7_namespace_loop_script'
+"   :let $TEST_SKIP_PAT = 'Test_expr8_namespace_loop_script'
-def Test_expr7_namespace_loop_script()
+def Test_expr8_namespace_loop_script()
 var lines =<< trim END
 vim9script
 # check using g: in a for loop more than DO_NOT_FREE_CNT times
 var exists = 0
 var exists_not = 0
 assert_equal(100000, exists_not)
 END
 CheckScriptSuccess(lines)
 enddef
-def Test_expr7_parens()
+def Test_expr8_parens()
 # (expr)
 var lines =<< trim END
 assert_equal(4, (6 * 4) / 6)
 assert_equal(0, 6 * ( 4 / 6 ))
 assert_equal('onetwo', s)
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_negate_add()
+def Test_expr8_negate_add()
 var lines =<< trim END
 assert_equal(-99, -99)
 assert_equal(-99, - 99)
 assert_equal(99, +99)
 def LegacyReturn(): string
 legacy return #{key: 'ok'}.key
 enddef
-def Test_expr7_legacy_script()
+def Test_expr8_legacy_script()
 var lines =<< trim END
 let s:legacy = 'legacy'
 def GetLocal(): string
 return legacy
 enddef
 def s:Echo4Arg(arg: any): string
 return arg
 enddef
-def Test_expr7_call()
+def Test_expr8_call()
 var lines =<< trim END
 assert_equal('yes', 'yes'->Echo())
 assert_equal(true, !range(5)->empty())
 assert_equal([0, 1, 2], 3->range())
 END
 &rtp = save_rtp
 delete('Xruntime', 'rf')
 enddef
-def Test_expr7_method_call()
+def Test_expr8_method_call()
 var lines =<< trim END
 new
 setline(1, ['first', 'last'])
 'second'->append(1)
 "third"->append(2)
 RetVoid()->byteidx(3)
 END
 CheckDefExecFailure(lines, 'E1013:')
 enddef
-def Test_expr7_method_call_linebreak()
+def Test_expr8_method_call_linebreak()
 # this was giving an error when skipping over the expression
 var lines =<< trim END
 vim9script
 def Test()
 var a: dict<any> = {b: {}}
 assert_equal('', v:errmsg)
 END
 CheckScriptSuccess(lines)
 enddef
+def Test_expr8_method_call_import()
-def Test_expr7_not()
+var lines =<< trim END
+vim9script
+export def Square(items: list<number>): list<number>
+return map(items, (_, i) => i * i)
+enddef
+END
+call writefile(lines, 'Xsquare.vim')
+lines =<< trim END
+vim9script
+import './Xsquare.vim'
+def Test(): list<number>
+return range(5)
+->Xsquare.Square()
+->map((_, i) => i * 10)
+enddef
+assert_equal([0, 10, 40, 90, 160], Test())
+END
+CheckScriptSuccess(lines)
+delete('Xsquare.vim')
+enddef
+def Test_expr8_not()
 var lines =<< trim END
 assert_equal(true, !'')
 assert_equal(true, ![])
 assert_equal(false, !'asdf')
 assert_equal(false, ![2])
 CheckDefAndScriptSuccess(lines)
 enddef
 let g:anumber = 42
-def Test_expr7_negate()
+def Test_expr8_negate()
 var lines =<< trim END
 var nr = 1
 assert_equal(-1, -nr)
 assert_equal(-42, -g:anumber)
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-func Test_expr7_fails()
+func Test_expr8_fails()
 call CheckDefFailure(["var x = (12"], "E1097:", 3)
 call CheckScriptFailure(['vim9script', "var x = (12"], 'E110:', 2)
 call CheckDefAndScriptFailure(["var x = -'xx'"], "E1030:", 1)
 call CheckDefAndScriptFailure(["var x = +'xx'"], "E1030:", 1)
 func CallMe2(one, two)
 return a:one .. a:two
 endfunc
-def Test_expr7_trailing()
+def Test_expr8_trailing()
 var lines =<< trim END
 # user function call
 assert_equal(123, g:CallMe(123))
 assert_equal(123, g:CallMe(  123))
 assert_equal(123, g:CallMe(123  ))
 assert_equal(123, d.key)
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_string_subscript()
+def Test_expr8_string_subscript()
 var lines =<< trim END
 var text = 'abcdef'
 assert_equal('f', text[-1])
 assert_equal('a', text[0])
 assert_equal('e', text[4])
 echo d
 END
 CheckDefAndScriptFailure(lines, ['E1012: Type mismatch; expected number but got string', 'E1030: Using a String as a Number: "2"'], 1)
 enddef
-def Test_expr7_list_subscript()
+def Test_expr8_list_subscript()
 var lines =<< trim END
 var list = [0, 1, 2, 3, 4]
 assert_equal(0, list[0])
 assert_equal(4, list[4])
 assert_equal(4, list[-1])
 defcompile
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_dict_subscript()
+def Test_expr8_dict_subscript()
 var lines =<< trim END
 var l = [{lnum: 2}, {lnum: 1}]
 var res = l[0].lnum > l[1].lnum
 assert_true(res)
 defcompile
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_blob_subscript()
+def Test_expr8_blob_subscript()
 var lines =<< trim END
 var b = 0z112233
 assert_equal(0x11, b[0])
 assert_equal(0z112233, b[:])
 assert_equal(0z01ab, g:ablob[:])
 END
 CheckDefAndScriptSuccess(lines)
 enddef
-def Test_expr7_subscript_linebreak()
+def Test_expr8_subscript_linebreak()
 var lines =<< trim END
 var range = range(
 3)
 var l = range
 ->mapnew('string(v:key)')
 one)
 END
 CheckDefAndScriptFailure(lines, ['E1127:', 'E116:'], 2)
 enddef
-func Test_expr7_trailing_fails()
+func Test_expr8_trailing_fails()
 call CheckDefAndScriptFailure(['var l = [2]', 'l->((ll) => add(ll, 8))'], 'E107:', 2)
 call CheckDefAndScriptFailure(['var l = [2]', 'l->((ll) => add(ll, 8)) ()'], 'E274:', 2)
 endfunc
 func Test_expr_fails()

Mercurial > vim

comparison src/testdir/test_vim9_expr.vim @ 27191:63f8dbcf6a74 v8.2.4124