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

Extract Function: In case of top-level and member declarations place extracted function after the original container

Browse Source
This commit is contained in:
Alexey Sedunov
2014-05-30 14:37:41 +04:00
parent ae7ad6d61c
commit 3c5c0248a7
138 changed files with 482 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt.after
+9 -9
View File
@@ -1,16 +1,16 @@
// NEXT_SIBLING:
fun b(a: Int, b: Int): Boolean {
if (a + b > 0) return true
println(a - b)
if (a - b > 0) return true
println(a + b)
return false
}
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
if (b(a, b)) break
}
return 1
}
fun b(a: Int, b: Int): Boolean {
if (a + b > 0) return true
println(a - b)
if (a - b > 0) return true
println(a + b)
return false
}
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt.after
+10 -10
View File
@@ -1,13 +1,4 @@
// NEXT_SIBLING:
fun b(a: Int, b: Int): Boolean {
if (a + b > 0) return true
else {
println(a - b)
if (a - b > 0) return true else println(a + b)
}
return false
}
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
@@ -15,4 +6,13 @@ fun foo(a: Int): Int {
}
return 1
}
fun b(a: Int, b: Int): Boolean {
if (a + b > 0) return true
else {
println(a - b)
if (a - b > 0) return true else println(a + b)
}
return false
}
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt.after
+9 -9
View File
@@ -1,4 +1,12 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
if (b(a, b)) break
}
return 1
}
fun b(a: Int, b: Int): Boolean {
when {
a + b > 0 -> return true
@@ -6,12 +14,4 @@ fun b(a: Int, b: Int): Boolean {
else -> println(0)
}
return false
}
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
if (b(a, b)) break
}
return 1
}
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
<selection>if (a + b > 0) return 0
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt.after
+7 -7
View File
@@ -1,12 +1,12 @@
// NEXT_SIBLING:
fun b(a: Int, b: Int): Boolean {
if (a + b > 0) return true
println(a - b)
return false
}
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
if (b(a, b)) return 0
return 1
}
fun b(a: Int, b: Int): Boolean {
if (a + b > 0) return true
println(a - b)
return false
}
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
<selection>if (a + b > 0) return 0
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt.after
+7 -7
View File
@@ -1,13 +1,13 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
if (b(a, b)) return 0
return 1
}
fun b(a: Int, b: Int): Boolean {
if (a + b > 0) return true
else if (a - b < 0) println(a - b)
else println(0)
return false
}
fun foo(a: Int): Int {
val b: Int = 1
if (b(a, b)) return 0
return 1
}
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
<selection>when (a + b) {
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt.after
+8 -8
View File
@@ -1,4 +1,11 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
if (b(a, b)) return 0
return 1
}
fun b(a: Int, b: Int): Boolean {
when (a + b) {
0 -> return true
@@ -6,11 +13,4 @@ fun b(a: Int, b: Int): Boolean {
else -> println(2)
}
return false
}
fun foo(a: Int): Int {
val b: Int = 1
if (b(a, b)) return 0
return 1
}
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt.after
+7 -7
View File
@@ -1,10 +1,4 @@
// NEXT_SIBLING:
fun unit(a: Int, b: Int) {
if (a + b > 0) return
println(a - b)
return
}
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
@@ -12,4 +6,10 @@ fun foo(a: Int): Int {
break
}
return 1
}
fun unit(a: Int, b: Int) {
if (a + b > 0) return
println(a - b)
return
}
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt.after
+9 -9
View File
@@ -1,12 +1,4 @@
// NEXT_SIBLING:
fun unit(a: Int, b: Int) {
if (a + b > 0) return
else {
println(a - b)
return
}
}
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
@@ -14,4 +6,12 @@ fun foo(a: Int): Int {
break
}
return 1
}
fun unit(a: Int, b: Int) {
if (a + b > 0) return
else {
println(a - b)
return
}
}
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt.after
+10 -10
View File
@@ -1,4 +1,13 @@
// NEXT_SIBLING:
// SIBLING:
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
unit(a, b)
break
}
return 1
}
fun unit(a: Int, b: Int) {
when {
a + b > 0 -> return
@@ -8,13 +17,4 @@ fun unit(a: Int, b: Int) {
return
}
}
}
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
unit(a, b)
break
}
return 1
}