mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

API: nvim_call_dict_function: eliminate internal param

Browse Source 
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(".
This commit is contained in:
Justin M. Keyes
2018-05-04 08:20:37 +02:00
parent 19c2ce1901
commit fe7ab60af7
2 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
test/functional/api/vim_spec.lua
View File

@@ -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)