Skip to content
This repository was archived by the owner on Mar 27, 2023. It is now read-only.

Commit 528cb7c

Browse files
committed
:RAddParameterNB works
1 parent a6f662d commit 528cb7c

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

plugin/refactorings/add_parameter.vim

+9-10
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@ function! AddParameter()
88
return
99
endtry
1010

11-
" brackets
12-
if g:ruby_refactoring_brackets_have_space == 1
13-
let bracket_open = "( "
14-
let bracket_close = " )"
15-
else
16-
let bracket_open = "("
17-
let bracket_close = ")"
18-
endif
19-
20-
2111
" Save current position
2212
let cursor_position = getpos(".")
2313

@@ -30,6 +20,15 @@ function! AddParameter()
3020
" remove trailing whitespace
3121
s/\v\s$//e
3222

23+
" brackets
24+
if g:ruby_refactoring_brackets_have_space == 1
25+
let bracket_open = "( "
26+
let bracket_close = " )"
27+
else
28+
let bracket_open = "("
29+
let bracket_close = ")"
30+
endif
31+
3332
" test the line
3433
let line = getline(".")
3534

plugin/refactorings/add_parameter_without_using_brackets.vim

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
" Synopsis:
32
" Adds a parameter (or many separated with commas) to a method with no
43
" brackets
@@ -19,7 +18,22 @@ function! AddParameterNB()
1918
exec "?\\<def\\>"
2019
endif
2120

22-
execute "normal A " . name . "\<Esc>"
21+
" remove trailing whitespace
22+
s/\v\s$//e
23+
24+
" remove brackets
25+
s/\v\s*\( ?/ /e
26+
s/\v\s*\)//e
27+
28+
" test the line
29+
let has_parameter = match(getline("."), "\\vdef \\S+\\s+\\S+")
30+
31+
32+
if has_parameter != -1
33+
exec "normal A, " . name . "\<Esc>"
34+
else
35+
exec "normal A " . name . "\<Esc>"
36+
endif
2337

2438
" Restore caret position
2539
call setpos(".", cursor_position)

0 commit comments

Comments
 (0)