VimPlug/jedi-vim
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi-vim.git synced 2025-12-06 18:54:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
David Halter
2013-05-14 22:12:54 +04:30
parent 42b240c366 211cbf1fb7
commit daa7f1c60c
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
autoload/jedi.vim
View File

@@ -159,6 +159,11 @@ function! jedi#configure_function_definition()
autocmd CursorMovedI <buffer> call jedi#show_func_def() autocmd CursorMovedI <buffer> call jedi#show_func_def()
endfunction endfunction
if has('python')
command! -nargs=1 Python python <args>
else
command! -nargs=1 Python python3 <args>
end
Python << PYTHONEOF Python << PYTHONEOF
""" here we initialize the jedi stuff """ """ here we initialize the jedi stuff """

6
ftplugin/python/jedi.vim
View File

@@ -41,13 +41,13 @@ end
if g:jedi#popup_on_dot if g:jedi#popup_on_dot
if stridx(&completeopt, 'longest') > -1 if stridx(&completeopt, 'longest') > -1
if g:jedi#popup_select_first 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 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 end
else 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
end end

7
plugin/jedi.vim
View File

@@ -51,11 +51,4 @@ if g:jedi#auto_initialization
" order of invocation. " order of invocation.
autocmd FileType Python setlocal omnifunc=jedi#complete switchbuf=useopen " needed for pydoc autocmd FileType Python setlocal omnifunc=jedi#complete switchbuf=useopen " needed for pydoc
endif endif
if has('python')
command! -nargs=1 Python python <args>
else
command! -nargs=1 Python python3 <args>
end
" vim: set et ts=4: " vim: set et ts=4: