From f46f138fb6882ad98ed66fc6d4fa24fd6a97aeae Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 4 May 2018 08:23:37 +0200 Subject: test: nvim_call_function: verify "too many arguments" error --- test/functional/api/vim_spec.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'test/functional/api') diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index 718294d941..77cc7e6a05 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -158,13 +158,23 @@ describe('api', function() eq(17, nvim('call_function', 'eval', {17})) eq('foo', nvim('call_function', 'simplify', {'this/./is//redundant/../../../foo'})) end) - it("VimL error: fails (generic error), does NOT update v:errmsg", function() local status, rv = pcall(nvim, "call_function", "bogus function", {"arg1"}) eq(false, status) -- nvim_call_function() failed. ok(nil ~= string.find(rv, "Error calling function")) eq("", nvim("eval", "v:errmsg")) -- v:errmsg was not updated. end) + it('validates args', function() + local too_many_args = { 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x', 'x' } + source([[ + function! Foo(...) abort + echo a:000 + endfunction + ]]) + -- E740 + expect_err('Function called with too many arguments', request, + 'nvim_call_function', 'Foo', too_many_args) + end) end) describe('nvim_execute_lua', function() -- cgit From 124275dd58ae998decbc8891f9feb7e239a8a7e1 Mon Sep 17 00:00:00 2001 From: Sebastian Witte Date: Wed, 2 May 2018 23:38:18 +0200 Subject: API: nvim_call_dict_function #3032 --- test/functional/api/vim_spec.lua | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'test/functional/api') diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index 77cc7e6a05..67e49ff46d 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -4,17 +4,19 @@ local global_helpers = require('test.helpers') local NIL = helpers.NIL local clear, nvim, eq, neq = helpers.clear, helpers.nvim, helpers.eq, helpers.neq +local command = helpers.command +local funcs = helpers.funcs +local iswin = helpers.iswin +local meth_pcall = helpers.meth_pcall +local meths = helpers.meths local ok, nvim_async, feed = helpers.ok, helpers.nvim_async, helpers.feed local os_name = helpers.os_name -local meths = helpers.meths -local funcs = helpers.funcs local request = helpers.request -local meth_pcall = helpers.meth_pcall -local command = helpers.command -local iswin = helpers.iswin +local source = helpers.source -local intchar2lua = global_helpers.intchar2lua +local expect_err = global_helpers.expect_err local format_string = global_helpers.format_string +local intchar2lua = global_helpers.intchar2lua local mergedicts_copy = global_helpers.mergedicts_copy describe('api', function() @@ -177,6 +179,30 @@ describe('api', function() end) end) + describe('nvim_call_dict_function', function() + it('invokes VimL dict', function() + source('function! F(name) dict\n return self.greeting . ", " . a:name . "!"\nendfunction') + nvim('set_var', 'dict_function_dict', { greeting = 'Hello', F = 'function("F")' }) + eq('Hello, World!', nvim('call_dict_function', 'g:dict_function_dict', false, 'F', {'World'})) + eq({ greeting = 'Hello', F = 'function("F")' }, nvim('get_var', 'dict_function_dict')) + nvim('set_var', 'dict_function_dict_i', { greeting = 'Hi', F = "F" }) + eq('Hi, Moon!', nvim('call_dict_function', 'g:dict_function_dict_i', true, 'F', {'Moon'})) + eq({ greeting = 'Hi', F = "F" }, nvim('get_var', 'dict_function_dict_i')) + end) + it('invokes RPC dict', function() + source('function! G() dict\n return self.result\nendfunction') + eq('self', nvim('call_dict_function', { result = 'self', G = 'G'}, false, 'G', {})) + end) + it('fails for a RPC dictionary and internal set to true', function() + expect_err('Funcrefs are not supported for RPC dicts', request, + 'nvim_call_dict_function', { f = '' }, true, 'f', {1,2}) + end) + it('fails with empty function name', function() + expect_err('Invalid %(empty%) function name', request, + 'nvim_call_dict_function', "{ 'f': '' }", true, 'f', {1,2}) + end) + end) + describe('nvim_execute_lua', function() it('works', function() meths.execute_lua('vim.api.nvim_set_var("test", 3)', {}) -- cgit From 19c2ce1901b08aa493ad3b12514d681cb22160f6 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 3 May 2018 00:20:14 +0200 Subject: refactor: nvim_call_dict_function - Add test coverage for errors. - Rename, rearrange. --- test/functional/api/vim_spec.lua | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'test/functional/api') diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index 67e49ff46d..f49469d201 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -183,23 +183,34 @@ describe('api', function() it('invokes VimL dict', function() source('function! F(name) dict\n return self.greeting . ", " . a:name . "!"\nendfunction') nvim('set_var', 'dict_function_dict', { greeting = 'Hello', F = 'function("F")' }) - eq('Hello, World!', nvim('call_dict_function', 'g:dict_function_dict', false, 'F', {'World'})) + eq('Hello, World!', nvim('call_dict_function', 'g:dict_function_dict', 'F', false, {'World'})) eq({ greeting = 'Hello', F = 'function("F")' }, nvim('get_var', 'dict_function_dict')) nvim('set_var', 'dict_function_dict_i', { greeting = 'Hi', F = "F" }) - eq('Hi, Moon!', nvim('call_dict_function', 'g:dict_function_dict_i', true, 'F', {'Moon'})) + eq('Hi, Moon!', nvim('call_dict_function', 'g:dict_function_dict_i', 'F', true, {'Moon'})) eq({ greeting = 'Hi', F = "F" }, nvim('get_var', 'dict_function_dict_i')) end) it('invokes RPC dict', function() source('function! G() dict\n return self.result\nendfunction') - eq('self', nvim('call_dict_function', { result = 'self', G = 'G'}, false, 'G', {})) + eq('self', nvim('call_dict_function', { result = 'self', G = 'G'}, 'G', false, {})) end) - it('fails for a RPC dictionary and internal set to true', function() - expect_err('Funcrefs are not supported for RPC dicts', request, - 'nvim_call_dict_function', { f = '' }, true, 'f', {1,2}) - end) - it('fails with empty function name', function() + it('validates args', function() + command('let g:d={"baz":"zub","meep":[]}') + expect_err('Function not found in dict', request, + 'nvim_call_dict_function', 'g:d', 'bogus', true, {1,2}) + expect_err('Error calling function.', request, + 'nvim_call_dict_function', 'g:d', 'baz', true, {1,2}) + expect_err('Value found in dict is not a valid function', request, + 'nvim_call_dict_function', 'g:d', 'meep', true, {1,2}) + expect_err('Cannot invoke RPC dict as a VimL reference', request, + 'nvim_call_dict_function', { f = '' }, 'f', true, {1,2}) expect_err('Invalid %(empty%) function name', request, - 'nvim_call_dict_function', "{ 'f': '' }", true, 'f', {1,2}) + 'nvim_call_dict_function', "{ 'f': '' }", 'f', true, {1,2}) + expect_err('dict argument type must be String or Dictionary', request, + 'nvim_call_dict_function', 42, 'f', true, {1,2}) + expect_err('Failed to evaluate dict expression', request, + 'nvim_call_dict_function', 'foo', 'f', true, {1,2}) + expect_err('Referenced dict does not exist', request, + 'nvim_call_dict_function', '42', 'f', true, {1,2}) end) end) -- cgit From fe7ab60af7c8fbc2b1830dcfbcff75e39f5c4bbe Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 4 May 2018 08:20:37 +0200 Subject: API: nvim_call_dict_function: eliminate `internal` param The `internal` param is difficult to explain, and will rarely be anything but `true`. To avoid it, use a hack: check if the resolved dict value starts with "function(". --- test/functional/api/vim_spec.lua | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'test/functional/api') diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index f49469d201..250c2e58ac 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -180,37 +180,45 @@ describe('api', function() end) describe('nvim_call_dict_function', function() - it('invokes VimL dict', function() - source('function! F(name) dict\n return self.greeting . ", " . a:name . "!"\nendfunction') + it('invokes VimL dict function', function() + source([[ + function! F(name) dict + return self.greeting . ", " . a:name . "!" + endfunction + ]]) + + -- function() ("non-internal") function nvim('set_var', 'dict_function_dict', { greeting = 'Hello', F = 'function("F")' }) - eq('Hello, World!', nvim('call_dict_function', 'g:dict_function_dict', 'F', false, {'World'})) + eq('Hello, World!', nvim('call_dict_function', 'g:dict_function_dict', 'F', {'World'})) eq({ greeting = 'Hello', F = 'function("F")' }, nvim('get_var', 'dict_function_dict')) + + -- "internal" function nvim('set_var', 'dict_function_dict_i', { greeting = 'Hi', F = "F" }) - eq('Hi, Moon!', nvim('call_dict_function', 'g:dict_function_dict_i', 'F', true, {'Moon'})) + eq('Hi, Moon!', nvim('call_dict_function', 'g:dict_function_dict_i', 'F', {'Moon'})) eq({ greeting = 'Hi', F = "F" }, nvim('get_var', 'dict_function_dict_i')) end) it('invokes RPC dict', function() source('function! G() dict\n return self.result\nendfunction') - eq('self', nvim('call_dict_function', { result = 'self', G = 'G'}, 'G', false, {})) + eq('it works', nvim('call_dict_function', { result = 'it works', G = 'G'}, 'G', {})) end) it('validates args', function() command('let g:d={"baz":"zub","meep":[]}') - expect_err('Function not found in dict', request, - 'nvim_call_dict_function', 'g:d', 'bogus', true, {1,2}) - expect_err('Error calling function.', request, - 'nvim_call_dict_function', 'g:d', 'baz', true, {1,2}) + expect_err('Error calling function', request, + 'nvim_call_dict_function', 'g:d', 'bogus', {1,2}) + expect_err('Error calling function', request, + 'nvim_call_dict_function', 'g:d', 'baz', {1,2}) expect_err('Value found in dict is not a valid function', request, - 'nvim_call_dict_function', 'g:d', 'meep', true, {1,2}) - expect_err('Cannot invoke RPC dict as a VimL reference', request, - 'nvim_call_dict_function', { f = '' }, 'f', true, {1,2}) + 'nvim_call_dict_function', 'g:d', 'meep', {1,2}) + expect_err('Error calling function', request, + 'nvim_call_dict_function', { f = '' }, 'f', {1,2}) expect_err('Invalid %(empty%) function name', request, - 'nvim_call_dict_function', "{ 'f': '' }", 'f', true, {1,2}) + 'nvim_call_dict_function', "{ 'f': '' }", 'f', {1,2}) expect_err('dict argument type must be String or Dictionary', request, - 'nvim_call_dict_function', 42, 'f', true, {1,2}) + 'nvim_call_dict_function', 42, 'f', {1,2}) expect_err('Failed to evaluate dict expression', request, - 'nvim_call_dict_function', 'foo', 'f', true, {1,2}) + 'nvim_call_dict_function', 'foo', 'f', {1,2}) expect_err('Referenced dict does not exist', request, - 'nvim_call_dict_function', '42', 'f', true, {1,2}) + 'nvim_call_dict_function', '42', 'f', {1,2}) end) end) -- cgit From cabffb0182097f0d6d5c22682c32282c459b5543 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 6 May 2018 14:37:51 +0200 Subject: API: nvim_call_dict_function: expect actual function, not name --- test/functional/api/vim_spec.lua | 45 ++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 18 deletions(-) (limited to 'test/functional/api') diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index 250c2e58ac..0ff755b320 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -183,42 +183,51 @@ describe('api', function() it('invokes VimL dict function', function() source([[ function! F(name) dict - return self.greeting . ", " . a:name . "!" + return self.greeting.', '.a:name.'!' + endfunction + let g:test_dict_fn = { 'greeting':'Hello', 'F':function('F') } + + let g:test_dict_fn2 = { 'greeting':'Hi' } + function g:test_dict_fn2.F2(name) + return self.greeting.', '.a:name.' ...' endfunction ]]) - -- function() ("non-internal") function - nvim('set_var', 'dict_function_dict', { greeting = 'Hello', F = 'function("F")' }) - eq('Hello, World!', nvim('call_dict_function', 'g:dict_function_dict', 'F', {'World'})) - eq({ greeting = 'Hello', F = 'function("F")' }, nvim('get_var', 'dict_function_dict')) + -- :help Dictionary-function + eq('Hello, World!', nvim('call_dict_function', 'g:test_dict_fn', 'F', {'World'})) + -- Funcref is sent as NIL over RPC. + eq({ greeting = 'Hello', F = NIL }, nvim('get_var', 'test_dict_fn')) - -- "internal" function - nvim('set_var', 'dict_function_dict_i', { greeting = 'Hi', F = "F" }) - eq('Hi, Moon!', nvim('call_dict_function', 'g:dict_function_dict_i', 'F', {'Moon'})) - eq({ greeting = 'Hi', F = "F" }, nvim('get_var', 'dict_function_dict_i')) - end) - it('invokes RPC dict', function() - source('function! G() dict\n return self.result\nendfunction') - eq('it works', nvim('call_dict_function', { result = 'it works', G = 'G'}, 'G', {})) + -- :help numbered-function + eq('Hi, Moon ...', nvim('call_dict_function', 'g:test_dict_fn2', 'F2', {'Moon'})) + -- Funcref is sent as NIL over RPC. + eq({ greeting = 'Hi', F2 = NIL }, nvim('get_var', 'test_dict_fn2')) + + -- Function specified via RPC dict. + source('function! G() dict\n return "@".(self.result)."@"\nendfunction') + eq('@it works@', nvim('call_dict_function', { result = 'it works', G = 'G'}, 'G', {})) end) + it('validates args', function() command('let g:d={"baz":"zub","meep":[]}') - expect_err('Error calling function', request, + expect_err('Not found: bogus', request, 'nvim_call_dict_function', 'g:d', 'bogus', {1,2}) - expect_err('Error calling function', request, + expect_err('Not a function: baz', request, 'nvim_call_dict_function', 'g:d', 'baz', {1,2}) - expect_err('Value found in dict is not a valid function', request, + expect_err('Not a function: meep', request, 'nvim_call_dict_function', 'g:d', 'meep', {1,2}) expect_err('Error calling function', request, 'nvim_call_dict_function', { f = '' }, 'f', {1,2}) - expect_err('Invalid %(empty%) function name', request, + expect_err('Not a function: f', request, 'nvim_call_dict_function', "{ 'f': '' }", 'f', {1,2}) expect_err('dict argument type must be String or Dictionary', request, 'nvim_call_dict_function', 42, 'f', {1,2}) expect_err('Failed to evaluate dict expression', request, 'nvim_call_dict_function', 'foo', 'f', {1,2}) - expect_err('Referenced dict does not exist', request, + expect_err('dict not found', request, 'nvim_call_dict_function', '42', 'f', {1,2}) + expect_err('Invalid %(empty%) function name', request, + 'nvim_call_dict_function', "{ 'f': '' }", '', {1,2}) end) end) -- cgit