azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract method refactoring should order parameters by first usage

Browse Source 
Fixes #KT-16198
This commit is contained in:
Kirill Rakhman
2017-03-05 13:26:04 +01:00
committed by asedunov
parent 1296c5444b
commit 646f50dd66
30 changed files with 76 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt
Vendored
+1 -1
View File
@@ -1,8 +1,8 @@
// WITH_RUNTIME
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
var b: Int = 1
idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt.after
Vendored
+3 -3
View File
@@ -1,16 +1,16 @@
// WITH_RUNTIME
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
var b: Int = 1
return i(a, b)
return i(b, a)
}
private fun i(a: Int, b: Int): Int {
private fun i(b: Int, a: Int): Int {
var b1 = b
b1 += a
println(b1)
idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt
Vendored
+1 -1
View File
@@ -2,8 +2,8 @@
// WITH_RUNTIME
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
var b: Int = 1
idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt.after
Vendored
+3 -3
View File
@@ -2,13 +2,13 @@
// WITH_RUNTIME
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
var b: Int = 1
val pair = pair(a, b)
val pair = pair(b, a)
b = pair.second
val t = pair.first
println(b)
@@ -16,7 +16,7 @@ fun foo(a: Int): Int {
return t
}
private fun pair(a: Int, b: Int): Pair<Int, Int> {
private fun pair(b: Int, a: Int): Pair<Int, Int> {
var b1 = b
return Pair({ b1 += a; b1 }(), b1)
}
idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt
Vendored
+1 -1
View File
@@ -2,8 +2,8 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt.after
Vendored
+3 -3
View File
@@ -2,22 +2,22 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
var b: Int = 1
var c: Int = 1
val pair = pair(a, b, c)
val pair = pair(b, a, c)
b = pair.first
c = pair.second
return b + c
}
private fun pair(a: Int, b: Int, c: Int): Pair<Int, Int> {
private fun pair(b: Int, a: Int, c: Int): Pair<Int, Int> {
var b1 = b
var c1 = c
b1 += a
idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt
Vendored
+1 -1
View File
@@ -2,8 +2,8 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt.after
Vendored
+3 -3
View File
@@ -2,8 +2,8 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
@@ -11,14 +11,14 @@ fun foo(a: Int): Int {
var c: Int = 1
val pair = 2
val pair1 = pair(a, b, c)
val pair1 = pair(b, a, c)
b = pair1.first
c = pair1.second
return b + c
}
private fun pair(a: Int, b: Int, c: Int): Pair<Int, Int> {
private fun pair(b: Int, a: Int, c: Int): Pair<Int, Int> {
var b1 = b
var c1 = c
b1 += a
idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
var b: Int = 1
idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after
Vendored
+3 -3
View File
@@ -1,17 +1,17 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
var b: Int = 1
b = i(a, b)
b = i(b, a)
return b
}
private fun i(a: Int, b: Int): Int {
private fun i(b: Int, a: Int): Int {
var b1 = b
b1 += a
println(b1)
idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt
Vendored
+1 -1
View File
@@ -5,8 +5,8 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var d: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var e: kotlin.Int defined in foo
idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt.after
Vendored
+3 -3
View File
@@ -5,8 +5,8 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var d: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var e: kotlin.Int defined in foo
@@ -17,7 +17,7 @@ fun foo(a: Int): Int {
var d: Int = 1
var e: Int = 1
val list = list(a, b, c, d, e)
val list = list(b, a, c, d, e)
b = list[0]
c = list[1]
d = list[2]
@@ -26,7 +26,7 @@ fun foo(a: Int): Int {
return b + c + d + e
}
private fun list(a: Int, b: Int, c: Int, d: Int, e: Int): List<Int> {
private fun list(b: Int, a: Int, c: Int, d: Int, e: Int): List<Int> {
var b1 = b
var c1 = c
var d1 = d
idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt
Vendored
+1 -1
View File
@@ -3,8 +3,8 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var d: kotlin.Int defined in foo
// SIBLING:
idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt.after
Vendored
+3 -3
View File
@@ -3,8 +3,8 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var d: kotlin.Int defined in foo
// SIBLING:
@@ -13,7 +13,7 @@ fun foo(a: Int): Int {
var c: Int = 1
var d: Int = 1
val triple = triple(a, b, c, d)
val triple = triple(b, a, c, d)
b = triple.first
c = triple.second
d = triple.third
@@ -21,7 +21,7 @@ fun foo(a: Int): Int {
return b + c + d
}
private fun triple(a: Int, b: Int, c: Int, d: Int): Triple<Int, Int, Int> {
private fun triple(b: Int, a: Int, c: Int, d: Int): Triple<Int, Int, Int> {
var b1 = b
var c1 = c
var d1 = d
idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt
Vendored
+1 -1
View File
@@ -2,8 +2,8 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt.after
Vendored
+3 -3
View File
@@ -2,20 +2,20 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int): Int {
var b: Int = 1
var c: Int = 1
b = i(a, b, c)
b = i(b, a, c)
return b
}
private fun i(a: Int, b: Int, c: Int): Int {
private fun i(b: Int, a: Int, c: Int): Int {
var b1 = b
var c1 = c
b1 += a