diff --git a/autoload/SpaceVim/autocmds.vim b/autoload/SpaceVim/autocmds.vim index 8390c9b87..950aa308a 100644 --- a/autoload/SpaceVim/autocmds.vim +++ b/autoload/SpaceVim/autocmds.vim @@ -34,7 +34,6 @@ function! SpaceVim#autocmds#init() abort autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS autocmd FileType python setlocal omnifunc=pythoncomplete#Complete - autocmd FileType php setlocal omnifunc=phpcomplete_extended#CompletePHP autocmd BufEnter * \ if empty(&buftype) && has('nvim') && &filetype != 'help' \| nnoremap :call MyTagfunc() diff --git a/autoload/SpaceVim/layers/lang.vim b/autoload/SpaceVim/layers/lang.vim index 154ee46be..b639c832d 100644 --- a/autoload/SpaceVim/layers/lang.vim +++ b/autoload/SpaceVim/layers/lang.vim @@ -1,7 +1,6 @@ function! SpaceVim#layers#lang#plugins() abort let plugins = [ \ ['Shougo/neosnippet.vim', { 'on_i' : 1 , 'on_ft' : 'neosnippet', 'loadconf' : 1, 'on_cmd' : 'NeoSnippetEdit'}], - \ ['m2mdas/phpcomplete-extended', { 'on_ft' : 'php'}], \ ['groenewege/vim-less', { 'on_ft' : ['less']}], \ ['cakebaker/scss-syntax.vim', { 'on_ft' : ['scss','sass']}], \ ['hail2u/vim-css3-syntax', { 'on_ft' : ['css','scss','sass']}], diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim index 238f477c3..e56400b2e 100644 --- a/config/plugins/deoplete.vim +++ b/config/plugins/deoplete.vim @@ -47,6 +47,9 @@ let g:deoplete#omni#input_patterns.php = [ \'[^. \t0-9]\->\w*', \'[^. \t0-9]\::\w*', \] +let g:deoplete#ignore_sources.php = ['omni', 'around', 'member'] +call deoplete#custom#set('phpcd', 'mark', '') +call deoplete#custom#set('phpcd', 'input_pattern', '\w*|[^. \t]->\w*|\w*::\w*') " lua let g:deoplete#omni_patterns.lua = '.'