Skip to content

Commit 49d82e9

Browse files
author
Enrique Comba Riepenhausen
committed
Merge pull request #33 from pythonandchips/introduce_variable
Introduce variable
2 parents bea7cae + 57cbcd4 commit 49d82e9

7 files changed

+138
-5
lines changed

‎features/README.markdown

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Ruby Refactoring Tool for Vim
22

3+
To develop with vim refactoring create a symlink between the folder you have cloned this plugin and your .vim/bundle folder
4+
35
## Issues
46

57
If you identify any issues or specific funtionality you would like to see added, write the Cucumber feature and submit an [issue](https://github.com/ecomba/vim-ruby-refactoring/issues) or a [pull](https://github.com/ecomba/vim-ruby-refactoring/pulls) request:
68

7-
@issue
9+
@issue
810
Scenario: Add a parameter to a method defined with no parameters or parentheses
911
Given I have the following code:
1012
"""
@@ -20,5 +22,5 @@ If you identify any issues or specific funtionality you would like to see added,
2022
"""
2123
def set_name(name)
2224
end
23-
25+
2426
"""

‎features/extract_local_variable.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Feature: Extract Local Variable :RExtractLocalVariable
2727
local_variable
2828
end
2929
end
30-
30+
3131
"""
3232

3333
@issue
@@ -53,5 +53,5 @@ Feature: Extract Local Variable :RExtractLocalVariable
5353
local_variable
5454
end
5555
end
56-
56+
5757
"""

‎features/introduce_variable.feature

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
Feature: Introduce variable :RIntroduceVariable
2+
Take a method of instancated class and introduce variable
3+
4+
Shortcuts:
5+
:RIntroduceVariable
6+
<leader>riv
7+
8+
Scenario: Introduce variable from class
9+
Given I have the following code:
10+
"""
11+
HelloWorld.new
12+
"""
13+
When I select the class and execute:
14+
"""
15+
:RIntroduceVariable
16+
"""
17+
Then I should see:
18+
"""
19+
hello_world = HelloWorld.new
20+
"""
21+
22+
Scenario: Introduce variable from method name
23+
Given I have the following code:
24+
"""
25+
hello_world.person
26+
"""
27+
When I select the class and execute:
28+
"""
29+
:RIntroduceVariable
30+
"""
31+
Then I should see:
32+
"""
33+
person = hello_world.person
34+
"""
35+
36+
Scenario: Introduce variable when method has parameters
37+
Given I have the following code:
38+
"""
39+
hello_world.person("Foo", "Bar")
40+
"""
41+
When I select the class and execute:
42+
"""
43+
:RIntroduceVariable
44+
"""
45+
Then I should see:
46+
"""
47+
person = hello_world.person("Foo", "Bar")
48+
"""
49+
50+
Scenario: Introduce variable when method has parameters that include method call
51+
Given I have the following code:
52+
"""
53+
hello_world.person("Foo", Bar.new)
54+
"""
55+
When I select the class and execute:
56+
"""
57+
:RIntroduceVariable
58+
"""
59+
Then I should see:
60+
"""
61+
person = hello_world.person("Foo", Bar.new)
62+
"""
63+
64+
Scenario: Introduce variable when method has parameters that starts with a hash
65+
Given I have the following code:
66+
"""
67+
hello_world.person {:foo => "bar}
68+
"""
69+
When I select the class and execute:
70+
"""
71+
:RIntroduceVariable
72+
"""
73+
Then I should see:
74+
"""
75+
person = hello_world.person {:foo => "bar}
76+
"""
77+
78+
Scenario: Introduce variable when method has parameters on the second method name
79+
Given I have the following code:
80+
"""
81+
hello_world.person.name("Foo", Bar.new)
82+
"""
83+
When I select the class and execute:
84+
"""
85+
:RIntroduceVariable
86+
"""
87+
Then I should see:
88+
"""
89+
name = hello_world.person.name("Foo", Bar.new)
90+
"""

‎features/step_definitions/introduce_variable_steps.rb

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
When /^I select the class and execute:$/ do |command|
2+
@commands = ":normal gg$"
3+
add_return_key
4+
add_to_commands command
5+
add_return_key
6+
end
7+

‎features/step_definitions/shared_steps.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
Then /^I should see:$/ do |result|
10-
result_of_executing_the_commands.should == result
10+
result_of_executing_the_commands.strip.should == result.strip
1111
end
1212

1313
When /^I go to line "([^"]*)" and execute:$/ do |line, command|

‎plugin/refactorings/general/introducevariable.vim

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
"Synopsis:
2+
" Introduce variable from class or method name
3+
function! IntroduceVariable()
4+
let original_a = @a
5+
6+
normal ^
7+
8+
call search('\.*(\|{\|\n', 'p')
9+
normal hh"ayiw
10+
11+
let line = @a
12+
13+
if line == "new"
14+
normal ^"ayiw
15+
let line = @a
16+
endif
17+
18+
let @a = original_a
19+
let var = s:snakecase(line)
20+
exec "normal I" . var . " = "
21+
22+
endfunction
23+
24+
function! s:snakecase(word)
25+
let word = substitute(a:word,'::','/','g')
26+
let word = substitute(word,'\(\u\+\)\(\u\l\)','\1_\2','g')
27+
let word = substitute(word,'\(\l\|\d\)\(\u\)','\1_\2','g')
28+
let word = substitute(word,'-','_','g')
29+
let word = tolower(word)
30+
return word
31+
endfunction

‎plugin/ruby-refactoring.vim

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
" Contributions from Stuart Gale (@bishboria)
1111
"
1212
" Some support functions borrowed from Luc Hermitte's lh-vim library
13+
" Also borrowed snake case function from tim popes vim-abloish plugin
1314

1415
" Load all refactoring recipes
1516
exec 'runtime ' . expand('<sfile>:p:h') . '/refactorings/general/*.vim'
@@ -24,6 +25,7 @@ command! RAddParameterNB call AddParameterNB()
2425
command! RInlineTemp call InlineTemp()
2526
command! RExtractLet call ExtractIntoRspecLet()
2627
command! RConvertPostConditional call ConvertPostConditional()
28+
command! RIntroduceVariable call IntroduceVariable()
2729

2830
command! -range RExtractConstant call ExtractConstant()
2931
command! -range RExtractLocalVariable call ExtractLocalVariable()
@@ -41,6 +43,7 @@ nnoremap <leader>rapn :RAddParameterNB<cr>
4143
nnoremap <leader>rit :RInlineTemp<cr>
4244
nnoremap <leader>rel :RExtractLet<cr>
4345
nnoremap <leader>rcpc :RConvertPostConditional<cr>
46+
nnoremap <leader>riv :RIntroduceVariable<cr>
4447
4548
vnoremap <leader>rec :RExtractConstant<cr>
4649
vnoremap <leader>relv :RExtractLocalVariable<cr>

0 commit comments

Comments
 (0)