2828if ! exists (' g:vim_php_refactoring_auto_validate_rename' )
2929 let g: vim_php_refactoring_auto_validate_rename = g: vim_php_refactoring_auto_validate
3030endif
31+
32+ if ! exists (' g:vim_php_refactoring_auto_validate_visibility' )
33+ let g: vim_php_refactoring_ask_visibility = g: vim_php_refactoring_auto_validate
34+ endif
35+
36+ if ! exists (' g:vim_php_refactoring_default_property_visibility' )
37+ let g: vim_php_refactoring_default_property_visibility = ' private'
38+ endif
39+
40+ if ! exists (' g:vim_php_refactoring_default_method_visibility' )
41+ let g: vim_php_refactoring_default_method_visibility = ' private'
42+ endif
3143" }}}
3244
3345" Refactoring mapping {{{
@@ -79,7 +91,7 @@ function! PhpDocAll() " {{{
7991 return
8092 endif
8193 normal magg
82- while search (s: php_regex_class_line , ' eW' ) > 0
94+ while search (s: php_regex_class_line , ' eW' ) > 0
8395 call s: PhpDocument ()
8496 endwhile
8597 normal gg
@@ -201,9 +213,13 @@ function! PhpExtractClassProperty() " {{{
201213 normal mr
202214 let l: name = expand (' <cword>' )
203215 call s: PhpReplaceInCurrentFunction (' $' . l: name . ' \>' , ' $this->' . l: name )
204- let l: visibility = inputdialog (" Visibility (default is private): " )
205- if empty (l: visibility )
206- let l: visibility = ' private'
216+ if g: vim_php_refactoring_auto_validate_visibility == 0
217+ let l: visibility = inputdialog (" Visibility (default is " . g: vim_php_refactoring_default_property_visibility . " ): " )
218+ if empty (l: visibility )
219+ let l: visibility = g: vim_php_refactoring_default_property_visibility
220+ endif
221+ else
222+ let l: visibility = g: vim_php_refactoring_default_property_visibility
207223 endif
208224 call s: PhpInsertProperty (l: name , l: visibility )
209225 normal `r
@@ -216,9 +232,13 @@ function! PhpExtractMethod() range " {{{
216232 return
217233 endif
218234 let l: name = inputdialog (" Name of new method: " )
219- let l: visibility = inputdialog (" Visibility (default is private): " )
220- if empty (l: visibility )
221- let l: visibility = ' private'
235+ if g: vim_php_refactoring_auto_validate_visibility == 0
236+ let l: visibility = inputdialog (" Visibility (default is " . g: vim_php_refactoring_default_method_visibility . " ): " )
237+ if empty (l: visibility )
238+ let l: visibility = g: vim_php_refactoring_default_method_visibility
239+ endif
240+ else
241+ let l: visibility = g: vim_php_refactoring_default_method_visibility
222242 endif
223243 normal gv" xdmr
224244 let l: middleLine = line (' .' )
@@ -265,9 +285,13 @@ endfunction
265285
266286function ! PhpCreateProperty () " {{{
267287 let l: name = inputdialog (" Name of new property: " )
268- let l: visibility = inputdialog (" Visibility (default is private): " )
269- if empty (l: visibility )
270- let l: visibility = ' private'
288+ if g: vim_php_refactoring_auto_validate_visibility == 0
289+ let l: visibility = inputdialog (" Visibility (default is " . g: vim_php_refactoring_default_property_visibility . " ): " )
290+ if empty (l: visibility )
291+ let l: visibility = g: vim_php_refactoring_default_property_visibility
292+ endif
293+ else
294+ let l: visibility = g: vim_php_refactoring_default_property_visibility
271295 endif
272296 call s: PhpInsertProperty (l: name , l: visibility )
273297endfunction
@@ -391,10 +415,10 @@ function! s:PhpInsertProperty(name, visibility) " {{{
391415 if match (l: line , s: php_regex_class_line ) > -1
392416 call search (' {' , ' W' )
393417 call s: PhpInsertPropertyExtended (a: name , a: visibility , line (' .' ), 0 )
394- else
418+ else
395419 call s: PhpInsertPropertyExtended (a: name , a: visibility , line (' .' ), 1 )
396420 endif
397- else
421+ else
398422 call s: PhpInsertPropertyExtended (a: name , a: visibility , line (' .' ), 0 )
399423 endif
400424endfunction
0 commit comments