Improve deoplete and python loading

This commit is contained in:
ViViDboarder 2017-05-30 14:10:55 -07:00
parent 58a1a42b3d
commit a51e3655a2
3 changed files with 8 additions and 7 deletions

View File

@ -75,7 +75,7 @@ Plug 'avakhov/vim-yaml'
Plug 'cespare/vim-toml' Plug 'cespare/vim-toml'
Plug 'dag/vim-fish' Plug 'dag/vim-fish'
Plug 'dart-lang/dart-vim-plugin' Plug 'dart-lang/dart-vim-plugin'
Plug 'fatih/vim-go' Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
Plug 'groovy.vim' Plug 'groovy.vim'
Plug 'hsanson/vim-android' Plug 'hsanson/vim-android'
Plug 'pangloss/vim-javascript' Plug 'pangloss/vim-javascript'

View File

@ -2,8 +2,8 @@
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'Shougo/neoinclude.vim' Plug 'Shougo/neoinclude.vim'
Plug 'Shougo/neco-syntax' Plug 'Shougo/neco-syntax'
Plug 'zchee/deoplete-jedi' Plug 'zchee/deoplete-jedi', { 'for': 'python' }
Plug 'zchee/deoplete-go' Plug 'zchee/deoplete-go', { 'do': 'make' }
inoremap <silent><expr> <C-Space> pumvisible() ? "\<C-n>" : deoplete#mappings#manual_complete() inoremap <silent><expr> <C-Space> pumvisible() ? "\<C-n>" : deoplete#mappings#manual_complete()
inoremap <silent><expr> <nul> pumvisible() ? "\<C-n>" : deoplete#mappings#manual_complete() inoremap <silent><expr> <nul> pumvisible() ? "\<C-n>" : deoplete#mappings#manual_complete()
@ -20,11 +20,12 @@ endif
" Set allowed sources " Set allowed sources
let g:deoplete#sources._ = ['buffer', 'member', 'file', 'tag'] ", 'omni'] let g:deoplete#sources._ = ['buffer', 'member', 'file', 'tag'] ", 'omni']
let g:deoplete#sources.go = ['buffer', 'member', 'file', 'omni']
let g:deoplete#sources.python = ['buffer', 'member', 'file', 'omni'] let g:deoplete#sources.python = ['buffer', 'member', 'file', 'omni']
" Set default keyword pattern (vim regex) " Set default keyword pattern (vim regex)
let g:deoplete#keyword_patterns['default'] = '\h\w*' let g:deoplete#keyword_patterns['default'] = '\h\w*'
" Set omni patters for deoplete (python3 regex) " Set omni patters for deoplete (python3 regex)
let g:deoplete#omni#input_patterns.go = '[^.[:digit:] *\t]\%(\.\|->\)' let g:deoplete#omni#input_patterns.go = '([^. \t](\.|->))\w*'
let g:deoplete#omni#input_patterns.python = '([^. \t]\.|^\s*@|^\s*from\s.+ import |^\s*from |^\s*import )\w*' let g:deoplete#omni#input_patterns.python = '([^. \t]\.|^\s*@|^\s*from\s.+ import |^\s*from |^\s*import )\w*'
" Default settings " Default settings

View File

@ -1,12 +1,12 @@
" All Python plugins and settings " All Python plugins and settings
Plug 'alfredodeza/coveragepy.vim' Plug 'alfredodeza/coveragepy.vim', { 'for': 'python' }
Plug 'alfredodeza/pytest.vim' Plug 'alfredodeza/pytest.vim', { 'for': 'python' }
" pytest.vim {{ " pytest.vim {{
nmap <silent><leader>ptp <Esc>:Pytest project<CR> nmap <silent><leader>ptp <Esc>:Pytest project<CR>
nmap <silent><leader>ptf <Esc>:Pytest file<CR> nmap <silent><leader>ptf <Esc>:Pytest file<CR>
nmap <silent><leader>ptm <Esc>:Pytest method<CR> nmap <silent><leader>ptm <Esc>:Pytest method<CR>
" }} pytest.vim " }} pytest.vim
Plug 'davidhalter/jedi-vim' Plug 'davidhalter/jedi-vim', { 'for': 'python' }
" jedi-vim {{ " jedi-vim {{
let g:jedi#auto_vim_configuration = 0 let g:jedi#auto_vim_configuration = 0
let g:jedi#completions_enabled = 0 let g:jedi#completions_enabled = 0