Move jedi#_vim_exceptions before call to jedi#init_python

It might be used during setup, in the case of errors and needs to be
defined then already.
This commit is contained in:
Daniel Hahler
2015-05-01 22:53:29 +02:00
parent e5038cc9fa
commit dd4cb80911

View File

@@ -154,6 +154,25 @@ function! jedi#force_py_version_switch()
endfunction endfunction
" Helper function instead of `python vim.eval()`, and `.command()` because
" these also return error definitions.
function! jedi#_vim_exceptions(str, is_eval)
let l:result = {}
try
if a:is_eval
let l:result.result = eval(a:str)
else
execute a:str
let l:result.result = ''
endif
catch
let l:result.exception = v:exception
let l:result.throwpoint = v:throwpoint
endtry
return l:result
endfunction
if !jedi#init_python() if !jedi#init_python()
" Do not define any functions when Python initialization failed. " Do not define any functions when Python initialization failed.
finish finish
@@ -324,6 +343,7 @@ function! jedi#configure_call_signatures()
autocmd CursorMovedI <buffer> PythonJedi jedi_vim.show_call_signatures() autocmd CursorMovedI <buffer> PythonJedi jedi_vim.show_call_signatures()
endfunction endfunction
" Determine where the current window is on the screen for displaying call " Determine where the current window is on the screen for displaying call
" signatures in the correct column. " signatures in the correct column.
function! s:save_first_col() function! s:save_first_col()
@@ -372,24 +392,6 @@ function! s:save_first_col()
endtry endtry
endfunction endfunction
" Helper function instead of `python vim.eval()`, and `.command()` because
" these also return error definitions.
function! jedi#_vim_exceptions(str, is_eval)
let l:result = {}
try
if a:is_eval
let l:result.result = eval(a:str)
else
execute a:str
let l:result.result = ''
endif
catch
let l:result.exception = v:exception
let l:result.throwpoint = v:throwpoint
endtry
return l:result
endfunction
function! jedi#complete_string(is_popup_on_dot) function! jedi#complete_string(is_popup_on_dot)