mirror of
https://github.com/davidhalter/jedi-vim.git
synced 2025-12-06 10:54:22 +08:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
@@ -159,6 +159,11 @@ function! jedi#configure_function_definition()
|
||||
autocmd CursorMovedI <buffer> call jedi#show_func_def()
|
||||
endfunction
|
||||
|
||||
if has('python')
|
||||
command! -nargs=1 Python python <args>
|
||||
else
|
||||
command! -nargs=1 Python python3 <args>
|
||||
end
|
||||
|
||||
Python << PYTHONEOF
|
||||
""" here we initialize the jedi stuff """
|
||||
|
||||
@@ -41,13 +41,13 @@ end
|
||||
if g:jedi#popup_on_dot
|
||||
if stridx(&completeopt, 'longest') > -1
|
||||
if g:jedi#popup_select_first
|
||||
inoremap <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>\<lt>C-N>" : ""<CR>
|
||||
inoremap <silent> <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>\<lt>C-N>" : ""<CR>
|
||||
else
|
||||
inoremap <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>" : ""<CR>
|
||||
inoremap <silent> <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>" : ""<CR>
|
||||
end
|
||||
|
||||
else
|
||||
inoremap <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>\<lt>C-P>" : ""<CR>
|
||||
inoremap <silent> <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>\<lt>C-P>" : ""<CR>
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -51,11 +51,4 @@ if g:jedi#auto_initialization
|
||||
" order of invocation.
|
||||
autocmd FileType Python setlocal omnifunc=jedi#complete switchbuf=useopen " needed for pydoc
|
||||
endif
|
||||
|
||||
if has('python')
|
||||
command! -nargs=1 Python python <args>
|
||||
else
|
||||
command! -nargs=1 Python python3 <args>
|
||||
end
|
||||
|
||||
" vim: set et ts=4:
|
||||
|
||||
Reference in New Issue
Block a user