28
28
if ! exists (' g:vim_php_refactoring_auto_validate_rename' )
29
29
let g: vim_php_refactoring_auto_validate_rename = g: vim_php_refactoring_auto_validate
30
30
endif
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
31
43
" }}}
32
44
33
45
" Refactoring mapping {{{
@@ -79,7 +91,7 @@ function! PhpDocAll() " {{{
79
91
return
80
92
endif
81
93
normal magg
82
- while search (s: php_regex_class_line , ' eW' ) > 0
94
+ while search (s: php_regex_class_line , ' eW' ) > 0
83
95
call s: PhpDocument ()
84
96
endwhile
85
97
normal gg
@@ -201,9 +213,13 @@ function! PhpExtractClassProperty() " {{{
201
213
normal mr
202
214
let l: name = expand (' <cword>' )
203
215
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
207
223
endif
208
224
call s: PhpInsertProperty (l: name , l: visibility )
209
225
normal `r
@@ -216,9 +232,13 @@ function! PhpExtractMethod() range " {{{
216
232
return
217
233
endif
218
234
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
222
242
endif
223
243
normal gv" xdmr
224
244
let l: middleLine = line (' .' )
@@ -265,9 +285,13 @@ endfunction
265
285
266
286
function ! PhpCreateProperty () " {{{
267
287
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
271
295
endif
272
296
call s: PhpInsertProperty (l: name , l: visibility )
273
297
endfunction
@@ -391,10 +415,10 @@ function! s:PhpInsertProperty(name, visibility) " {{{
391
415
if match (l: line , s: php_regex_class_line ) > -1
392
416
call search (' {' , ' W' )
393
417
call s: PhpInsertPropertyExtended (a: name , a: visibility , line (' .' ), 0 )
394
- else
418
+ else
395
419
call s: PhpInsertPropertyExtended (a: name , a: visibility , line (' .' ), 1 )
396
420
endif
397
- else
421
+ else
398
422
call s: PhpInsertPropertyExtended (a: name , a: visibility , line (' .' ), 0 )
399
423
endif
400
424
endfunction
0 commit comments