diff --git a/nvim/UltiSnips/php_perso.snippets b/nvim/UltiSnips/php_perso.snippets index a811bc33..55bfdd14 100755 --- a/nvim/UltiSnips/php_perso.snippets +++ b/nvim/UltiSnips/php_perso.snippets @@ -149,3 +149,6 @@ class ${1:`!p snip.rv=snip.basename`} extends UnitTestCase } endsnippet +snippet @var "var phpdoc" b +/** @var $0 */ +endsnippet diff --git a/nvim/init.vim b/nvim/init.vim index acee8ce7..b0772a9c 100755 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -131,10 +131,9 @@ Plug 'lumiliet/vim-twig', {'for': 'twig'} Plug 'pangloss/vim-javascript' " need to run npm install in the folder ~/nvim/plugged/tern_for_vim Plug 'ternjs/tern_for_vim', { 'for': ['javascript', 'javascript.jsx', 'vue'], 'do': 'npm install'} -" Plug 'othree/jspc.vim', { 'for': ['javascript', 'javascript.jsx', 'vue'] } Plug 'leafgarland/typescript-vim' -Plug 'mhartington/nvim-typescript', {'do': './install.sh'} +" Plug 'mhartington/nvim-typescript', {'do': './install.sh'} " For react Plug 'mxw/vim-jsx' diff --git a/nvim/pluggedconf/ncm.nvimrc b/nvim/pluggedconf/ncm2.nvimrc similarity index 100% rename from nvim/pluggedconf/ncm.nvimrc rename to nvim/pluggedconf/ncm2.nvimrc diff --git a/nvim/pluggedconf/php/phpactor.nvimrc b/nvim/pluggedconf/php/phpactor.nvimrc index 406e5670..e128a55f 100755 --- a/nvim/pluggedconf/php/phpactor.nvimrc +++ b/nvim/pluggedconf/php/phpactor.nvimrc @@ -1,5 +1,5 @@ -" This use a global install of PHPActor and not the Vim plugin for even more -" configuration possibilities +let g:phpactorOmniError = v:true +autocmd FileType php setlocal omnifunc=phpactor#Complete " namespace automatic insert nnoremap u :call phpactor#UseAdd() @@ -22,8 +22,6 @@ nnoremap rei :call phpactor#ClassInflect() xnoremap rem :call phpactor#ExtractMethod() nnoremap src :call phpactor#FindReferences() -" go to definition of a method / class / whatever via Ctags -" map ] :vsp :exec("tag ".expand("")) map ] :call phpactor#GotoDefinition() function! PHPModify(transformer) @@ -31,3 +29,4 @@ function! PHPModify(transformer) execute "read !phpactor class:transform ".expand('%').' --transform='.a:transformer normal! ggdd endfunction +