aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Hinz <mh.codebro@gmail.com>2016-12-13 14:48:42 +0100
committerGitHub <noreply@github.com>2016-12-13 14:48:42 +0100
commit5855f30cb1a1bd6b4eee7ea8e2e80eb7eec8f3ec (patch)
treede8c529a55d9787a0f7a98a5a20a6d217a87cc24
parentdbe41fe310fd558f402364a8425373318aad827e (diff)
downloadrneovim-5855f30cb1a1bd6b4eee7ea8e2e80eb7eec8f3ec.tar.gz
rneovim-5855f30cb1a1bd6b4eee7ea8e2e80eb7eec8f3ec.tar.bz2
rneovim-5855f30cb1a1bd6b4eee7ea8e2e80eb7eec8f3ec.zip
Make VimL code compatible with merged Partial support (#5765)
Closes #5763.
-rw-r--r--runtime/autoload/health/provider.vim2
-rw-r--r--runtime/autoload/vimexpect.vim2
-rw-r--r--test/functional/core/job_spec.lua6
3 files changed, 5 insertions, 5 deletions
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
index dce0abd671..cb32dab376 100644
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -25,7 +25,7 @@ function! s:version_cmp(a, b) abort
endfunction
" Handler for s:system() function.
-function! s:system_handler(jobid, data, event) abort
+function! s:system_handler(jobid, data, event) dict abort
if a:event == 'stdout' || a:event == 'stderr'
let self.output .= join(a:data, '')
elseif a:event == 'exit'
diff --git a/runtime/autoload/vimexpect.vim b/runtime/autoload/vimexpect.vim
index 16e7d30d6c..0ed888d2a4 100644
--- a/runtime/autoload/vimexpect.vim
+++ b/runtime/autoload/vimexpect.vim
@@ -140,7 +140,7 @@ endfunction
" Job handler that simply forwards lines to the parser.
-function! s:JobOutput(id, lines)
+function! s:JobOutput(_id, lines, _event) dict
call self._parser.feed(a:lines)
endfunction
diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua
index 34085fa522..fa38671529 100644
--- a/test/functional/core/job_spec.lua
+++ b/test/functional/core/job_spec.lua
@@ -368,11 +368,11 @@ describe('jobs', function()
eq({'notification', 'wait', {{-2}}}, next_msg())
end)
- pending('can be called recursively', function()
+ it('can be called recursively', function()
source([[
let g:opts = {}
let g:counter = 0
- function g:opts.on_stdout(id, msg)
+ function g:opts.on_stdout(id, msg, _event)
if self.state == 0
if self.counter < 10
call Run()
@@ -390,7 +390,7 @@ describe('jobs', function()
call jobclose(a:id, 'stdin')
endif
endfunction
- function g:opts.on_exit()
+ function g:opts.on_exit(...)
call rpcnotify(g:channel, 'w', printf('job %d exited', self.counter))
endfunction
function Run()