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

Merge #4553

Browse Source
This commit is contained in:
Justin M. Keyes
2016-04-18 05:43:21 -04:00
parent ef92cca7cc a347b29aa3
commit 1b1b920ba8
2 changed files with 195 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/autoload/remote/define.vim
View File

@@ -1,7 +1,7 @@
function! remote#define#CommandOnHost(host, method, sync, name, opts) function! remote#define#CommandOnHost(host, method, sync, name, opts)
let prefix = '' let prefix = ''
if has_key(a:opts, 'range') if has_key(a:opts, 'range')
if a:opts.range == '' || a:opts.range == '%' if a:opts.range == '' || a:opts.range == '%'
" -range or -range=%, pass the line range in a list " -range or -range=%, pass the line range in a list
let prefix = '<line1>,<line2>' let prefix = '<line1>,<line2>'
@@ -157,6 +157,9 @@ endfunction
function! remote#define#FunctionOnChannel(channel, method, sync, name, opts) function! remote#define#FunctionOnChannel(channel, method, sync, name, opts)
let rpcargs = [a:channel, '"'.a:method.'"', 'a:000'] let rpcargs = [a:channel, '"'.a:method.'"', 'a:000']
if has_key(a:opts, 'range')
call add(rpcargs, '[a:firstline, a:lastline]')
endif
call s:AddEval(rpcargs, a:opts) call s:AddEval(rpcargs, a:opts)
let function_def = s:GetFunctionPrefix(a:name, a:opts) let function_def = s:GetFunctionPrefix(a:name, a:opts)
@@ -187,7 +190,7 @@ let s:next_gid = 1
function! s:GetNextAutocmdGroup() function! s:GetNextAutocmdGroup()
let gid = s:next_gid let gid = s:next_gid
let s:next_gid += 1 let s:next_gid += 1
let group_name = 'RPC_DEFINE_AUTOCMD_GROUP_'.gid let group_name = 'RPC_DEFINE_AUTOCMD_GROUP_'.gid
" Ensure the group is defined " Ensure the group is defined
exe 'augroup '.group_name.' | augroup END' exe 'augroup '.group_name.' | augroup END'
@@ -218,7 +221,11 @@ endfunction
function! s:GetFunctionPrefix(name, opts) function! s:GetFunctionPrefix(name, opts)
return "function! ".a:name."(...)\n" let res = "function! ".a:name."(...)"
if has_key(a:opts, 'range')
let res = res." range"
endif
return res."\n"
endfunction endfunction

359
test/functional/provider/define_spec.lua
View File

@@ -64,153 +64,137 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
args = args..', "RpcCommand"' args = args..', "RpcCommand"'
end) end)
describe('without options', function() it('without options', function()
it('ok', function() call(fn, args..', {}')
call(fn, args..', {}') local function on_setup()
local function on_setup() command('RpcCommand')
command('RpcCommand') end
end
local function handler(method) local function handler(method)
eq('test-handler', method) eq('test-handler', method)
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with nargs', function() it('with nargs', function()
it('ok', function() call(fn, args..', {"nargs": "*"}')
call(fn, args..', {"nargs": "*"}') local function on_setup()
local function on_setup() command('RpcCommand arg1 arg2 arg3')
command('RpcCommand arg1 arg2 arg3') end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({'arg1', 'arg2', 'arg3'}, arguments[1]) eq({'arg1', 'arg2', 'arg3'}, arguments[1])
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with range', function() it('with range', function()
it('ok', function() call(fn,args..', {"range": ""}')
call(fn,args..', {"range": ""}') local function on_setup()
local function on_setup() command('1,1RpcCommand')
command('1,1RpcCommand') end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({1, 1}, arguments[1]) eq({1, 1}, arguments[1])
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with nargs/range', function() it('with nargs/range', function()
it('ok', function() call(fn, args..', {"nargs": "1", "range": ""}')
call(fn, args..', {"nargs": "1", "range": ""}') local function on_setup()
local function on_setup() command('1,1RpcCommand arg')
command('1,1RpcCommand arg') end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({'arg'}, arguments[1]) eq({'arg'}, arguments[1])
eq({1, 1}, arguments[2]) eq({1, 1}, arguments[2])
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with nargs/count', function() it('with nargs/count', function()
it('ok', function() call(fn, args..', {"nargs": "1", "range": "5"}')
call(fn, args..', {"nargs": "1", "range": "5"}') local function on_setup()
local function on_setup() command('5RpcCommand arg')
command('5RpcCommand arg') end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({'arg'}, arguments[1]) eq({'arg'}, arguments[1])
eq(5, arguments[2]) eq(5, arguments[2])
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with nargs/count/bang', function() it('with nargs/count/bang', function()
it('ok', function() call(fn, args..', {"nargs": "1", "range": "5", "bang": ""}')
call(fn, args..', {"nargs": "1", "range": "5", "bang": ""}') local function on_setup()
local function on_setup() command('5RpcCommand! arg')
command('5RpcCommand! arg') end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({'arg'}, arguments[1]) eq({'arg'}, arguments[1])
eq(5, arguments[2]) eq(5, arguments[2])
eq(1, arguments[3]) eq(1, arguments[3])
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with nargs/count/bang/register', function() it('with nargs/count/bang/register', function()
it('ok', function() call(fn, args..', {"nargs": "1", "range": "5", "bang": "",'..
call(fn, args..', {"nargs": "1", "range": "5", "bang": "",'.. ' "register": ""}')
' "register": ""}') local function on_setup()
local function on_setup() command('5RpcCommand! b arg')
command('5RpcCommand! b arg') end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({'arg'}, arguments[1]) eq({'arg'}, arguments[1])
eq(5, arguments[2]) eq(5, arguments[2])
eq(1, arguments[3]) eq(1, arguments[3])
eq('b', arguments[4]) eq('b', arguments[4])
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with nargs/count/bang/register/eval', function() it('with nargs/count/bang/register/eval', function()
it('ok', function() call(fn, args..', {"nargs": "1", "range": "5", "bang": "",'..
call(fn, args..', {"nargs": "1", "range": "5", "bang": "",'.. ' "register": "", "eval": "@<reg>"}')
' "register": "", "eval": "@<reg>"}') local function on_setup()
local function on_setup() command('let @b = "regb"')
command('let @b = "regb"') command('5RpcCommand! b arg')
command('5RpcCommand! b arg') end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({'arg'}, arguments[1]) eq({'arg'}, arguments[1])
eq(5, arguments[2]) eq(5, arguments[2])
eq(1, arguments[3]) eq(1, arguments[3])
eq('b', arguments[4]) eq('b', arguments[4])
eq('regb', arguments[5]) eq('regb', arguments[5])
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
end) end)
end) end)
@@ -236,37 +220,33 @@ local function autocmd_specs_for(fn, sync, first_arg_factory, init)
args = args..', "BufEnter"' args = args..', "BufEnter"'
end) end)
describe('without options', function() it('without options', function()
it('ok', function() call(fn, args..', {}')
call(fn, args..', {}') local function on_setup()
local function on_setup() command('doautocmd BufEnter x.c')
command('doautocmd BufEnter x.c') end
end
local function handler(method) local function handler(method)
eq('test-handler', method) eq('test-handler', method)
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with eval', function() it('with eval', function()
it('ok', function() call(fn, args..[[, {'eval': 'expand("<afile>")'}]])
call(fn, args..[[, {'eval': 'expand("<afile>")'}]]) local function on_setup()
local function on_setup() command('doautocmd BufEnter x.c')
command('doautocmd BufEnter x.c') end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq('x.c', arguments[1]) eq('x.c', arguments[1])
return '' return ''
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
end) end)
end) end)
@@ -292,46 +272,77 @@ local function function_specs_for(fn, sync, first_arg_factory, init)
args = args..', "TestFunction"' args = args..', "TestFunction"'
end) end)
describe('without options', function() it('without options', function()
it('ok', function() call(fn, args..', {}')
call(fn, args..', {}') local function on_setup()
local function on_setup() if sync then
if sync then eq('rv', eval('TestFunction(1, "a", ["b", "c"])'))
eq('rv', eval('TestFunction(1, "a", ["b", "c"])')) else
else eq(1, eval('TestFunction(1, "a", ["b", "c"])'))
eq(1, eval('TestFunction(1, "a", ["b", "c"])'))
end
end end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({{1, 'a', {'b', 'c'}}}, arguments) eq({{1, 'a', {'b', 'c'}}}, arguments)
return 'rv' return 'rv'
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end)
end) end)
describe('with eval', function() it('with eval', function()
it('ok', function() call(fn, args..[[, {'eval': '2 + 2'}]])
call(fn, args..[[, {'eval': '2 + 2'}]]) local function on_setup()
local function on_setup() if sync then
if sync then eq('rv', eval('TestFunction(1, "a", ["b", "c"])'))
eq('rv', eval('TestFunction(1, "a", ["b", "c"])')) else
else eq(1, eval('TestFunction(1, "a", ["b", "c"])'))
eq(1, eval('TestFunction(1, "a", ["b", "c"])'))
end
end end
end
local function handler(method, arguments) local function handler(method, arguments)
eq('test-handler', method) eq('test-handler', method)
eq({{1, 'a', {'b', 'c'}}, 4}, arguments) eq({{1, 'a', {'b', 'c'}}, 4}, arguments)
return 'rv' return 'rv'
end end
runx(sync, handler, on_setup) runx(sync, handler, on_setup)
end) end)
it('with range', function()
helpers.insert([[
foo
bar
baz
zub]])
call(fn, args..[[, {'range': ''}]])
local function on_setup()
command('2,3call TestFunction(1, "a", ["b", "c"])')
end
local function handler(method, arguments)
eq('test-handler', method)
eq({{1, 'a', {'b', 'c'}}, {2, 3}}, arguments)
return 'rv'
end
runx(sync, handler, on_setup)
end)
it('with eval/range', function()
call(fn, args..[[, {'eval': '4', 'range': ''}]])
local function on_setup()
command('%call TestFunction(1, "a", ["b", "c"])')
end
local function handler(method, arguments)
eq('test-handler', method)
eq({{1, 'a', {'b', 'c'}}, {1, 1}, 4}, arguments)
return 'rv'
end
runx(sync, handler, on_setup)
end) end)
end) end)
end) end)