stonewareslord/fzf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vim] Simplify :FZF

Browse Source 
Ruby version can also accept `--expect` option although it's ignored.
This commit is contained in:
Junegunn Choi 2015-04-14 10:46:20 +09:00
parent 51a19a2804
commit 319d6ced80
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/fzf.vim
View File

@ -26,7 +26,6 @@ let s:launcher = 'xterm -e bash -ic %s'
let s:fzf_go = expand('<sfile>:h:h').'/bin/fzf' let s:fzf_go = expand('<sfile>:h:h').'/bin/fzf'
let s:fzf_rb = expand('<sfile>:h:h').'/fzf' let s:fzf_rb = expand('<sfile>:h:h').'/fzf'
let s:fzf_tmux = expand('<sfile>:h:h').'/bin/fzf-tmux' let s:fzf_tmux = expand('<sfile>:h:h').'/bin/fzf-tmux'
let s:legacy = 0
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
@ -41,7 +40,6 @@ function! s:fzf_exec()
let s:exec = path[0] let s:exec = path[0]
elseif executable(s:fzf_rb) elseif executable(s:fzf_rb)
let s:exec = s:fzf_rb let s:exec = s:fzf_rb
let s:legacy = 1
else else
call system('type fzf') call system('type fzf')
if v:shell_error if v:shell_error
@ -326,10 +324,7 @@ function! s:cmd_callback(lines) abort
endfunction endfunction
function! s:cmd(bang, ...) abort function! s:cmd(bang, ...) abort
let args = copy(a:000) let args = extend(['--expect=ctrl-t,ctrl-x,ctrl-v'], a:000)
if !s:legacy
let args = insert(args, '--expect=ctrl-t,ctrl-x,ctrl-v', 0)
endif
let opts = {} let opts = {}
if len(args) > 0 && isdirectory(expand(args[-1])) if len(args) > 0 && isdirectory(expand(args[-1]))
let opts.dir = remove(args, -1) let opts.dir = remove(args, -1)
@ -337,15 +332,10 @@ function! s:cmd(bang, ...) abort
if !a:bang if !a:bang
let opts.down = get(g:, 'fzf_tmux_height', s:default_tmux_height) let opts.down = get(g:, 'fzf_tmux_height', s:default_tmux_height)
endif endif
call fzf#run(extend({'options': join(args), 'sink*': function('<sid>cmd_callback')}, opts))
if s:legacy
call fzf#run(extend({ 'options': join(args), 'sink': 'e' }, opts))
else
call fzf#run(extend({ 'options': join(args), 'sink*': function('<sid>cmd_callback') }, opts))
endif
endfunction endfunction
command! -nargs=* -complete=dir -bang FZF call s:cmd('<bang>' == '!', <f-args>) command! -nargs=* -complete=dir -bang FZF call s:cmd(<bang>0, <f-args>)
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save