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

[vim] Display proper error message when command failed

Browse Source
This commit is contained in:
Junegunn Choi 2015-09-20 14:09:54 +09:00
parent ebea470875
commit 5a60aa5050
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugin/fzf.vim
View File

@ -40,9 +40,7 @@ function! s:fzf_exec()
\ input('fzf executable not found. Download binary? (y/n) ') =~? '^y' \ input('fzf executable not found. Download binary? (y/n) ') =~? '^y'
redraw redraw
echo echo
echohl WarningMsg call s:warn('Downloading fzf binary. Please wait ...')
echo 'Downloading fzf binary. Please wait ...'
echohl None
let s:installed = 1 let s:installed = 1
call system(s:install.' --bin') call system(s:install.' --bin')
return s:fzf_exec() return s:fzf_exec()
@ -98,14 +96,24 @@ function! s:upgrade(dict)
return copy return copy
endfunction endfunction
function! s:error(msg)
echohl ErrorMsg
echom a:msg
echohl None
endfunction
function! s:warn(msg)
echohl WarningMsg
echom a:msg
echohl None
endfunction
function! fzf#run(...) abort function! fzf#run(...) abort
try try
let oshell = &shell let oshell = &shell
set shell=sh set shell=sh
if has('nvim') && bufexists('term://*:FZF') if has('nvim') && bufexists('term://*:FZF')
echohl WarningMsg call s:warn('FZF is already running!')
echomsg 'FZF is already running!'
echohl None
return [] return []
endif endif
let dict = exists('a:1') ? s:upgrade(a:1) : {} let dict = exists('a:1') ? s:upgrade(a:1) : {}
@ -230,9 +238,7 @@ function! s:execute(dict, command, temps)
if v:shell_error if v:shell_error
" Do not print error message on exit status 1 (no match) or 130 (interrupt) " Do not print error message on exit status 1 (no match) or 130 (interrupt)
if v:shell_error == 2 if v:shell_error == 2
echohl ErrorMsg call s:error('Error running ' . command)
echo 'Error running ' . command
echohl None
endif endif
return [] return []
else else
@ -249,6 +255,10 @@ function! s:execute_tmux(dict, command, temps)
call system(command) call system(command)
redraw! redraw!
if v:shell_error == 2
call s:error('Error running ' . command)
return []
endif
return s:callback(a:dict, a:temps) return s:callback(a:dict, a:temps)
endfunction endfunction
@ -310,6 +320,7 @@ function! s:execute_term(dict, command, temps)
call s:pushd(a:dict) call s:pushd(a:dict)
let fzf = { 'buf': bufnr('%'), 'dict': a:dict, 'temps': a:temps, 'name': 'FZF' } let fzf = { 'buf': bufnr('%'), 'dict': a:dict, 'temps': a:temps, 'name': 'FZF' }
let s:command = a:command
function! fzf.on_exit(id, code) function! fzf.on_exit(id, code)
let pos = s:getpos() let pos = s:getpos()
let inplace = pos == s:ppos " {'window': 'enew'} let inplace = pos == s:ppos " {'window': 'enew'}
@ -323,6 +334,13 @@ function! s:execute_term(dict, command, temps)
wincmd p wincmd p
endif endif
endif endif
if a:code == 2
call s:error('Error running ' . s:command)
sleep
return
endif
call s:pushd(self.dict) call s:pushd(self.dict)
try try
redraw! redraw!