From ff2314256f0e10c45223ad7e47faf8e24eed2a3d Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Tue, 17 Jan 2017 00:13:49 +0800
Subject: [PATCH 1/3] Add padawan

---
 autoload/SpaceVim/layers/lang/php.vim | 11 +++++++++++
 autoload/SpaceVim/mapping.vim         |  6 +++---
 config/plugins/neosnippet.vim         |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 autoload/SpaceVim/layers/lang/php.vim

diff --git a/autoload/SpaceVim/layers/lang/php.vim b/autoload/SpaceVim/layers/lang/php.vim
new file mode 100644
index 000000000..58185d6a2
--- /dev/null
+++ b/autoload/SpaceVim/layers/lang/php.vim
@@ -0,0 +1,11 @@
+function! SpaceVim#layers#lang#php#plugins() abort
+    let plugins = []
+    if has('nvim')
+        call add(plugins, ['padawan-php/deoplete-padawan'])
+    endif
+    return plugins
+endfunction
+
+function! SpaceVim#layers#lang#php#config() abort
+    
+endfunction
diff --git a/autoload/SpaceVim/mapping.vim b/autoload/SpaceVim/mapping.vim
index 778042746..810bacd8f 100644
--- a/autoload/SpaceVim/mapping.vim
+++ b/autoload/SpaceVim/mapping.vim
@@ -20,12 +20,12 @@ function! SpaceVim#mapping#tab() abort
     if getline('.')[col('.')-2] ==# '{'&& pumvisible()
         return "\<C-n>"
     endif
-    if !index(g:spacevim_plugin_groups, 'autocompletion') == -1
+    if index(g:spacevim_plugin_groups, 'autocomplete') != -1
         if neosnippet#expandable() && getline('.')[col('.')-2] ==# '(' && !pumvisible()
             return "\<Plug>(neosnippet_expand)"
         elseif neosnippet#jumpable()
-            && getline('.')[col('.')-2] ==# '(' && !pumvisible() 
-            && !neosnippet#expandable()
+                    \ && getline('.')[col('.')-2] ==# '(' && !pumvisible() 
+                    \ && !neosnippet#expandable()
             return "\<plug>(neosnippet_jump)"
         elseif neosnippet#expandable_or_jumpable() && getline('.')[col('.')-2] !=#'('
             return "\<plug>(neosnippet_expand_or_jump)"
diff --git a/config/plugins/neosnippet.vim b/config/plugins/neosnippet.vim
index e07fc6c1d..fa360ccfe 100644
--- a/config/plugins/neosnippet.vim
+++ b/config/plugins/neosnippet.vim
@@ -13,7 +13,7 @@ augroup neosnippet_complete_done
     autocmd CompleteDone * call s:my_complete_done()
 augroup END
 function! s:my_complete_done() abort "{{{
-    if get(v:,'completed_item','') ==# ''
+    if !empty(get(v:,'completed_item',''))
         let snippet = neosnippet#parser#_get_completed_snippet(v:completed_item,neosnippet#util#get_cur_text(), neosnippet#util#get_next_text())
         if snippet ==# ''
             return

From 0841ba200c107379e5e912b876a7ea2ce342de7d Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Tue, 17 Jan 2017 21:51:56 +0800
Subject: [PATCH 2/3] Add phpcd

---
 autoload/SpaceVim/layers/lang/php.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autoload/SpaceVim/layers/lang/php.vim b/autoload/SpaceVim/layers/lang/php.vim
index 58185d6a2..7e4158d82 100644
--- a/autoload/SpaceVim/layers/lang/php.vim
+++ b/autoload/SpaceVim/layers/lang/php.vim
@@ -3,6 +3,7 @@ function! SpaceVim#layers#lang#php#plugins() abort
     if has('nvim')
         call add(plugins, ['padawan-php/deoplete-padawan'])
     endif
+    call add(plugins, ['wsdjeg/phpcd.vim'])
     return plugins
 endfunction
 

From a84a91780fc6c6846860e42078ab19334ae2901e Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 18 Jan 2017 00:43:36 +0800
Subject: [PATCH 3/3] Use omni

---
 autoload/SpaceVim/layers/lang/php.vim | 2 +-
 config/plugins/deoplete.vim           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/autoload/SpaceVim/layers/lang/php.vim b/autoload/SpaceVim/layers/lang/php.vim
index 7e4158d82..d20a44529 100644
--- a/autoload/SpaceVim/layers/lang/php.vim
+++ b/autoload/SpaceVim/layers/lang/php.vim
@@ -3,7 +3,7 @@ function! SpaceVim#layers#lang#php#plugins() abort
     if has('nvim')
         call add(plugins, ['padawan-php/deoplete-padawan'])
     endif
-    call add(plugins, ['wsdjeg/phpcd.vim'])
+    call add(plugins, ['php-vim/phpcd.vim'])
     return plugins
 endfunction
 
diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim
index 75da5018f..ea79ed44b 100644
--- a/config/plugins/deoplete.vim
+++ b/config/plugins/deoplete.vim
@@ -13,7 +13,8 @@ let g:deoplete#omni#input_patterns.java = [
             \]
 let g:deoplete#omni#input_patterns.jsp = ['[^. \t0-9]\.\w*']
 let g:deoplete#omni#input_patterns.php = '\h\w*\|[^. \t]->\%(\h\w*\)\?\|\h\w*::\%(\h\w*\)\?'
-let g:deoplete#ignore_sources = {}
+let g:deoplete#omni_patterns = get(g:, 'deoplete#omni_patterns', {})
+let g:deoplete#omni_patterns.php = '->\|::'let g:deoplete#ignore_sources = {}
 let g:deoplete#ignore_sources.go = ['omni']
 call deoplete#custom#set('go', 'mark', '')
 if g:spacevim_enable_javacomplete2_py