From c94e6613b3df5f31dfac0cfce13842f478347d8c Mon Sep 17 00:00:00 2001 From: Wang Shidong Date: Sun, 2 Jul 2017 11:17:05 -0500 Subject: [PATCH] Vim8 (#701) * Fix vim8 support * Fix vim8 job support --- autoload/SpaceVim/api/job.vim | 2 ++ autoload/SpaceVim/plugins/searcher.vim | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/autoload/SpaceVim/api/job.vim b/autoload/SpaceVim/api/job.vim index 5db27f407..1f0a859b8 100644 --- a/autoload/SpaceVim/api/job.vim +++ b/autoload/SpaceVim/api/job.vim @@ -21,6 +21,7 @@ function! s:self.warp(argv, opts) abort let obj = {} let obj._argv = a:argv let obj._opts = a:opts + let obj.in_io = get(a:opts, 'in_io', 'pipe') " @vimlint(EVL103, 1, a:job_id) function! obj._out_cb(job_id, data) abort if has_key(self._opts, 'on_stdout') @@ -45,6 +46,7 @@ function! s:self.warp(argv, opts) abort \ 'argv': a:argv, \ 'opts': { \ 'mode': 'nl', + \ 'in_io' : obj.in_io, \ 'out_cb': obj._out_cb, \ 'err_cb': obj._err_cb, \ 'exit_cb': obj._exit_cb, diff --git a/autoload/SpaceVim/plugins/searcher.vim b/autoload/SpaceVim/plugins/searcher.vim index 90f6ed65b..e4f327753 100644 --- a/autoload/SpaceVim/plugins/searcher.vim +++ b/autoload/SpaceVim/plugins/searcher.vim @@ -1,12 +1,16 @@ +let s:JOB = SpaceVim#api#import('job') + let s:rst = [] + function! SpaceVim#plugins#searcher#find(expr, exe) if empty(a:expr) let expr = input('search expr: ') else let expr = a:expr endif - call jobstart(s:get_search_cmd(a:exe, expr), { + call s:JOB.start(s:get_search_cmd(a:exe, expr), { \ 'on_stdout' : function('s:search_stdout'), + \ 'in_io' : 'null', \ 'on_exit' : function('s:search_exit'), \ }) endfunction