Source

dotfiles / _vimrc

Diff from to

File _vimrc

   endif
 endfunction
 
-" Make popup menu more usable
-" inoremap <expr> <Esc>      pumvisible() ? "\<C-e>" : "\<Esc>"
-" inoremap <expr> <cr>       pumvisible() ? "\<C-y>" : "\<cr>"
-" inoremap <expr> <Down>     pumvisible() ? "\<C-n>" : "\<Down>"
-" inoremap <expr> <Up>       pumvisible() ? "\<C-p>" : "\<Up>"
-" inoremap <expr> <PageDown> pumvisible() ? "\<PageDown>\<C-p>\<C-n>" : "\<PageDown>"
-" inoremap <expr> <PageUp>   pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<PageUp>"
-
 " =============================================================================
 " Plug-ins
 " =============================================================================
 nnoremap <silent> <leader>lb :LycosaBufferExplorer<cr>
 
 " Python-mode
-let g:pymode_doc_key = '<leader>pd'
+let g:pymode_syntax_print_as_function = 1
+
+let g:pymode_doc = 0  " Use jedi for this
+" let g:pymode_doc_key = 'K'
+
+let g:pymode_run = 1
 let g:pymode_run_key = '<leader>pr'
-let g:pymode_breakpoint_key = '<leader>pb'
 
-let g:pymode_lint = 0
+let g:pymode_breakpoint = 1
+let g:pymode_breakpoint_key = '<leader>b'
+
+let g:pymode_lint = 0  " Use khuno for this
 let g:pymode_lint_hold = 1
 let g:pymode_lint_onfly = 1
 let g:pymode_lint_mccabe_complexity = 10
 let g:pymode_options_other = 0
 
+let g:pymode_rope = 1
+let g:pymode_rope_vim_completion = 0
+map <leader>rj :RopeGotoDefinition<cr>
+map <leader>rr :RopeRename<cr>
+
+" Python jedi
+let g:jedi#auto_initialization = 1
+let g:jedi#auto_vim_configuration = 1
+let g:jedi#goto_command = "<leader>g"
+let g:jedi#get_definition_command = "<leader>d"
+let g:jedi#pydoc = "K"
+let g:jedi#rename_command = "<leader>r"
+let g:jedi#related_names_command = "<leader>n"
+let g:jedi#use_tabs_not_buffers = 0
+" let g:jedi#popup_on_dot = 0
+
 " Python Pytest
 nmap <silent> <leader>tf :Pytest file<cr>
 nmap <silent> <leader>tc :Pytest class<cr>
 nmap <silent> <leader>tp :Pytest previous<cr>
 nmap <silent> <leader>te :Pytest error<cr>
 
-" Python Rope
-map <leader>rj :RopeGotoDefinition<cr>
-map <leader>rr :RopeRename<cr>
-imap <c-tab> <C-R>=RopeCodeAssistInsertMode()<cr>
-let ropevim_vim_completion=1    " Use vim's complete function in insert mode
-let ropevim_extended_complete=1 " Show extended info about completion proposals
-let ropevim_guess_project=1     " Guess and open rope project automatically
-
-" Rename
+" Rename (current buffer)
 map <leader>mv :Rename
 
 " Supertab
 
 """ Python
 au FileType python setl fo+=c tw=72 cc+=73,80  " Auto-wrap comments using textwidth
-" let python_highlight_all=1
-" Enable python completion
-au FileType python set omnifunc=pythoncomplete#Complete