diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index a8d05c8..f33f996 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -36,8 +36,6 @@ Plug 'digitaltoad/vim-jade' "PHP Plug 'StanAngeloff/php.vim', {'for': 'php'} Plug 'lumiliet/vim-twig' -Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } -Plug 'padawan-php/deoplete-padawan', { 'for': 'php' } Plug 'roxma/LanguageServer-php-neovim', {'do': 'composer install && composer run-script parse-stubs', 'for': 'php'} Plug 'SirVer/ultisnips' | Plug 'phux/vim-snippets' "Git plugin @@ -55,7 +53,6 @@ Plug 'sbdchd/neoformat' function! DoRemote(arg) UpdateRemotePlugins endfunction -Plug 'Shougo/deoplete.nvim', { 'do': function('DoRemote') } call plug#end() @@ -102,43 +99,6 @@ set statusline+=%* " let g:deoplete#sources = get(g:,'deoplete#sources',{}) " let g:deoplete#sources.php = ['padawan', 'ultisnips', 'tags', 'buffer', 'LanguageClient'] -let g:deoplete#enable_at_startup = 1 -let g:deoplete#enable_ignore_case = 1 -let g:deoplete#enable_smart_case = 1 -let g:deoplete#enable_camel_case = 1 -let g:deoplete#enable_refresh_always = 1 -let g:deoplete#file#enable_buffer_path = 1 -let g:deoplete#max_abbr_width = 0 -let g:deoplete#max_menu_width = 0 -let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{}) -let g:deoplete#omni#input_patterns.java = [ - \'[^. \t0-9]\.\w*', - \'[^. \t0-9]\->\w*', - \'[^. \t0-9]\::\w*', - \] - -call deoplete#custom#source('buffer', 'mark', 'ℬ') -call deoplete#custom#source('ternjs', 'mark', '') -call deoplete#custom#source('omni', 'mark', '⌾') -call deoplete#custom#source('file', 'mark', 'file') -call deoplete#custom#source('jedi', 'mark', '') -call deoplete#custom#source('typescript', 'mark', '') -call deoplete#custom#source('neosnippet', 'mark', '') -call deoplete#custom#source('java', 'mark', '') -call deoplete#custom#source('javacomplete2', 'mark', '') - -call deoplete#custom#source('typescript', 'rank', 630) - -set completefunc=autoprogramming#complete -let g:deoplete#auto_complete_delay = 50 -let g:deoplete#ignore_sources = get(g:,'deoplete#ignore_sources',{}) -let g:deoplete#ignore_sources.java = ['omni'] -let g:deoplete#ignore_sources.php = ['omni'] -let g:deoplete#omni#functions = get(g:,'deoplete#omni#functions',{}) -call deoplete#custom#source('_', 'matchers', ['matcher_full_fuzzy']) -inoremap deoplete#mappings#smart_close_popup()."\" -inoremap deoplete#mappings#smart_close_popup()."\" -inoremap deoplete#mappings#manual_complete() function! GutentagsFilter(path) abort if fnamemodify(a:path, ':e') == 'java'