1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
|
This test exercises function and method extraction.
-- flags --
-ignore_extra_diags
-- basic.go --
package extract
//@codeactionedit(A_XLessThanYP, "refactor.extract", meth1, "Extract method")
//@codeactionedit(A_XLessThanYP, "refactor.extract", func1, "Extract function")
//@codeactionedit(A_AddP1, "refactor.extract", meth2, "Extract method")
//@codeactionedit(A_AddP1, "refactor.extract", func2, "Extract function")
//@codeactionedit(A_AddP2, "refactor.extract", meth3, "Extract method")
//@codeactionedit(A_AddP2, "refactor.extract", func3, "Extract function")
//@codeactionedit(A_XLessThanY, "refactor.extract", meth4, "Extract method")
//@codeactionedit(A_XLessThanY, "refactor.extract", func4, "Extract function")
//@codeactionedit(A_Add1, "refactor.extract", meth5, "Extract method")
//@codeactionedit(A_Add1, "refactor.extract", func5, "Extract function")
//@codeactionedit(A_Add2, "refactor.extract", meth6, "Extract method")
//@codeactionedit(A_Add2, "refactor.extract", func6, "Extract function")
type A struct {
x int
y int
}
func (a *A) XLessThanYP() bool {
return a.x < a.y //@loc(A_XLessThanYP, re`return.*a\.y`)
}
func (a *A) AddP() int {
sum := a.x + a.y //@loc(A_AddP1, re`sum.*a\.y`)
return sum //@loc(A_AddP2, re`return.*sum`)
}
func (a A) XLessThanY() bool {
return a.x < a.y //@loc(A_XLessThanY, re`return.*a\.y`)
}
func (a A) Add() int {
sum := a.x + a.y //@loc(A_Add1, re`sum.*a\.y`)
return sum //@loc(A_Add2, re`return.*sum`)
}
-- @func1/basic.go --
@@ -22 +22 @@
- return a.x < a.y //@loc(A_XLessThanYP, re`return.*a\.y`)
+ return newFunction(a) //@loc(A_XLessThanYP, re`return.*a\.y`)
@@ -25 +25,4 @@
+func newFunction(a *A) bool {
+ return a.x < a.y
+}
+
-- @func2/basic.go --
@@ -26 +26 @@
- sum := a.x + a.y //@loc(A_AddP1, re`sum.*a\.y`)
+ sum := newFunction(a) //@loc(A_AddP1, re`sum.*a\.y`)
@@ -30 +30,5 @@
+func newFunction(a *A) int {
+ sum := a.x + a.y
+ return sum
+}
+
-- @func3/basic.go --
@@ -27 +27 @@
- return sum //@loc(A_AddP2, re`return.*sum`)
+ return newFunction(sum) //@loc(A_AddP2, re`return.*sum`)
@@ -30 +30,4 @@
+func newFunction(sum int) int {
+ return sum
+}
+
-- @func4/basic.go --
@@ -31 +31 @@
- return a.x < a.y //@loc(A_XLessThanY, re`return.*a\.y`)
+ return newFunction(a) //@loc(A_XLessThanY, re`return.*a\.y`)
@@ -34 +34,4 @@
+func newFunction(a A) bool {
+ return a.x < a.y
+}
+
-- @func5/basic.go --
@@ -35 +35 @@
- sum := a.x + a.y //@loc(A_Add1, re`sum.*a\.y`)
+ sum := newFunction(a) //@loc(A_Add1, re`sum.*a\.y`)
@@ -39 +39,5 @@
+func newFunction(a A) int {
+ sum := a.x + a.y
+ return sum
+}
+
-- @func6/basic.go --
@@ -36 +36 @@
- return sum //@loc(A_Add2, re`return.*sum`)
+ return newFunction(sum) //@loc(A_Add2, re`return.*sum`)
@@ -39 +39,4 @@
+func newFunction(sum int) int {
+ return sum
+}
+
-- @meth1/basic.go --
@@ -22 +22 @@
- return a.x < a.y //@loc(A_XLessThanYP, re`return.*a\.y`)
+ return a.newMethod() //@loc(A_XLessThanYP, re`return.*a\.y`)
@@ -25 +25,4 @@
+func (a *A) newMethod() bool {
+ return a.x < a.y
+}
+
-- @meth2/basic.go --
@@ -26 +26 @@
- sum := a.x + a.y //@loc(A_AddP1, re`sum.*a\.y`)
+ sum := a.newMethod() //@loc(A_AddP1, re`sum.*a\.y`)
@@ -30 +30,5 @@
+func (a *A) newMethod() int {
+ sum := a.x + a.y
+ return sum
+}
+
-- @meth3/basic.go --
@@ -27 +27 @@
- return sum //@loc(A_AddP2, re`return.*sum`)
+ return a.newMethod(sum) //@loc(A_AddP2, re`return.*sum`)
@@ -30 +30,4 @@
+func (*A) newMethod(sum int) int {
+ return sum
+}
+
-- @meth4/basic.go --
@@ -31 +31 @@
- return a.x < a.y //@loc(A_XLessThanY, re`return.*a\.y`)
+ return a.newMethod() //@loc(A_XLessThanY, re`return.*a\.y`)
@@ -34 +34,4 @@
+func (a A) newMethod() bool {
+ return a.x < a.y
+}
+
-- @meth5/basic.go --
@@ -35 +35 @@
- sum := a.x + a.y //@loc(A_Add1, re`sum.*a\.y`)
+ sum := a.newMethod() //@loc(A_Add1, re`sum.*a\.y`)
@@ -39 +39,5 @@
+func (a A) newMethod() int {
+ sum := a.x + a.y
+ return sum
+}
+
-- @meth6/basic.go --
@@ -36 +36 @@
- return sum //@loc(A_Add2, re`return.*sum`)
+ return a.newMethod(sum) //@loc(A_Add2, re`return.*sum`)
@@ -39 +39,4 @@
+func (A) newMethod(sum int) int {
+ return sum
+}
+
-- context.go --
package extract
import "context"
//@codeactionedit(B_AddP, "refactor.extract", contextMeth1, "Extract method")
//@codeactionedit(B_AddP, "refactor.extract", contextFunc1, "Extract function")
//@codeactionedit(B_LongList, "refactor.extract", contextMeth2, "Extract method")
//@codeactionedit(B_LongList, "refactor.extract", contextFunc2, "Extract function")
type B struct {
x int
y int
}
func (b *B) AddP(ctx context.Context) (int, error) {
sum := b.x + b.y
return sum, ctx.Err() //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
}
func (b *B) LongList(ctx context.Context) (int, error) {
p1 := 1
p2 := 1
p3 := 1
return p1 + p2 + p3, ctx.Err() //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
}
-- @contextMeth1/context.go --
@@ -17 +17 @@
- return sum, ctx.Err() //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
+ return b.newMethod(ctx, sum) //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
@@ -20 +20,4 @@
+func (*B) newMethod(ctx context.Context, sum int) (int, error) {
+ return sum, ctx.Err()
+}
+
-- @contextMeth2/context.go --
@@ -24 +24 @@
- return p1 + p2 + p3, ctx.Err() //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
+ return b.newMethod(ctx, p1, p2, p3) //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
@@ -26 +26,4 @@
+
+func (*B) newMethod(ctx context.Context, p1 int, p2 int, p3 int) (int, error) {
+ return p1 + p2 + p3, ctx.Err()
+}
-- @contextFunc2/context.go --
@@ -24 +24 @@
- return p1 + p2 + p3, ctx.Err() //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
+ return newFunction(ctx, p1, p2, p3) //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
@@ -26 +26,4 @@
+
+func newFunction(ctx context.Context, p1 int, p2 int, p3 int) (int, error) {
+ return p1 + p2 + p3, ctx.Err()
+}
-- @contextFunc1/context.go --
@@ -17 +17 @@
- return sum, ctx.Err() //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
+ return newFunction(ctx, sum) //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
@@ -20 +20,4 @@
+func newFunction(ctx context.Context, sum int) (int, error) {
+ return sum, ctx.Err()
+}
+
|
