Extract Function: Do not suggest "unit" as function name

#KT-6402 Fixed
This commit is contained in:
Alexey Sedunov
2014-12-26 15:51:52 +03:00
parent 64ddd52e60
commit 86d5bd9365
38 changed files with 79 additions and 79 deletions
@@ -6,13 +6,13 @@
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
unit(a, b)
__dummyTestFun__(a, b)
break
}
return 1
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
if (a + b > 0) return
println(a - b)
return
@@ -6,13 +6,13 @@
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
unit(a, b)
__dummyTestFun__(a, b)
break
}
return 1
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
if (a + b > 0) return
else {
println(a - b)
@@ -6,13 +6,13 @@
fun foo(a: Int): Int {
val b: Int = 1
for (n in 1..a) {
unit(a, b)
__dummyTestFun__(a, b)
break
}
return 1
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
when {
a + b > 0 -> return
a - b > 0 -> return
@@ -7,10 +7,10 @@
fun foo(a: Int) {
val b: Int = 1
unit(a, b)
__dummyTestFun__(a, b)
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
if (a > 0) {
println(a)
}
@@ -8,13 +8,13 @@ fun foo(a: Int) {
val b: Int = 1
val c: Int
unit(a, b)
__dummyTestFun__(a, b)
c = 1
println(c)
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
if (a > 0) {
println(a)
}
@@ -4,10 +4,10 @@
fun foo(a: Int) {
val b: Int = 1
unit(a)
__dummyTestFun__(a)
}
private fun unit(a: Int) {
private fun __dummyTestFun__(a: Int) {
var t = a
while (t > 0) {
if (t == 2) continue
@@ -11,11 +11,11 @@ fun bar(a: Int): Int {
fun foo(a: Int) {
val b: Int = 1
unit(a, b)
__dummyTestFun__(a, b)
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
if (a > 0) {
bar(a)
} else {
@@ -11,9 +11,9 @@ fun bar(a: Int): Int {
fun foo(a: Int) {
val b: Int = 1
unit(a, b)
__dummyTestFun__(a, b)
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
if (a > 0) bar(a) else b
}
@@ -11,11 +11,11 @@ fun bar(a: Int): Int {
fun foo(a: Int) {
val b: Int = 1
unit(a, b)
__dummyTestFun__(a, b)
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
when {
a > 0 -> {
bar(a)
@@ -11,11 +11,11 @@ fun bar(a: Int): Int {
fun foo(a: Int) {
val b: Int = 1
unit(a, b)
__dummyTestFun__(a, b)
}
private fun unit(a: Int, b: Int) {
private fun __dummyTestFun__(a: Int, b: Int) {
when {
a > 0 -> bar(a)
else -> b
@@ -2,10 +2,10 @@ class T(val n: Int)
// SIBLING:
fun foo() {
unit()
__dummyTestFun__()
}
private fun unit() {
private fun __dummyTestFun__() {
bar { t ->
val k = 1
t.n + k + 1
@@ -2,10 +2,10 @@ class T(val n: Int)
// SIBLING:
fun foo() {
unit()
__dummyTestFun__()
}
private fun unit() {
private fun __dummyTestFun__() {
if (true) {
val k = 1
T().n + k + 1