Projects / CakeMate

diff --git a/vendors/vim/plugins/cakephp.vim b/vendors/vim/plugins/cakephp.vim index 6ca8841..d2d361c 100644 --- a/vendors/vim/plugins/cakephp.vim +++ b/vendors/vim/plugins/cakephp.vim @@ -295,9 +295,9 @@ function FormatPhp() range " correct whitespace around comas (parameters) :silent 'y,'zs/,\(\S\)\@=/, /ge " correct whitespace around assignments/comparisons x=y becomes x = y - :silent 'y,'zs/\([^\.!=<>&+- ]\)\([\.!<]\?==\?[=>&]\?\)\([^=<>& ]\)/\1 \2 \3/ge + :silent 'y,'zs/\([^\.!=<>&+\- ]\)\([\.!<]\?==\?[=>&]\?\)\([^=<>& ]\)/\1 \2 \3/ge " correct whitespace around assignments/comparisons x= y becomes x = y - :silent 'y,'zs/\([^\.!=<>&+- ]\)\([\.!<]\?==\?[=>&]\?\)/\1 \2/ge + :silent 'y,'zs/\([^\.!=<>&+\- ]\)\([\.!<]\?==\?[=>&]\?\)/\1 \2/ge " correct whitespace around assignments/comparisons x =y becomes x = y :silent 'y,'zs/\([\.!<]\?==\?[=>&]\?\)\([^=<>& ]\)/\1 \2/ge @@ -308,6 +308,10 @@ function FormatPhp() range " correct doc block contents/tail that is indented ( * or */) :silent 'y,'zs/^\s*\*/ \*/e + " auto correct deprecated methods + :silent 'y,'zs/\W\zsam(/array_merge(/e + + 'y,'z:call s:FormatComments() " indent