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
@@ -3,10 +3,10 @@
// SIBLING:
fun main(args: Array<String>) {
val (a, b) = Data(1, 2)
unit(a)
__dummyTestFun__(a)
}
private fun unit(a: Int) {
private fun __dummyTestFun__(a: Int) {
a
}
@@ -1,13 +1,13 @@
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
public annotation class P
}
private fun unit() {
private fun __dummyTestFun__() {
[MyClass.P] val t: Int = 1
t
}
@@ -1,7 +1,7 @@
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
public class P {
@@ -12,7 +12,7 @@ class MyClass {
}
}
private fun unit() {
private fun __dummyTestFun__() {
MyClass.P.foo()
MyClass.P.a
}
@@ -1,7 +1,7 @@
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
enum class P {
@@ -12,7 +12,7 @@ class MyClass {
}
}
private fun unit() {
private fun __dummyTestFun__() {
MyClass.P.A.foo()
MyClass.P.A.a
}
@@ -1,7 +1,7 @@
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
object P {
@@ -10,7 +10,7 @@ class MyClass {
}
}
private fun unit() {
private fun __dummyTestFun__() {
MyClass.P.foo()
MyClass.P.a
}
@@ -6,11 +6,11 @@ fun foo() = 1
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
}
private fun unit() {
private fun __dummyTestFun__() {
foo()
a
}
@@ -1,7 +1,7 @@
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
public class P<T> {
@@ -11,6 +11,6 @@ class MyClass {
}
}
private fun unit() {
private fun __dummyTestFun__() {
val t: MyClass.P<MyClass.P.Q>? = null
}
@@ -1,7 +1,7 @@
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
public class P<T> {
@@ -15,7 +15,7 @@ class MyClass {
}
}
private fun unit() {
private fun __dummyTestFun__() {
val a: Any = MyClass.P.Q()
val t = MyClass.P.R<MyClass.P.Q>(a as MyClass.P.Q)
}
@@ -1,7 +1,7 @@
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
public class P {
@@ -11,7 +11,7 @@ class MyClass {
}
}
private fun unit() {
private fun __dummyTestFun__() {
val t: MyClass.P.Q = MyClass.P.Q()
t
}
@@ -4,10 +4,10 @@ package p
object O {
val a = 1
fun test() {
unit()
__dummyTestFun__()
}
}
private fun unit() {
private fun __dummyTestFun__() {
O.a
}
@@ -1,13 +1,13 @@
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
public class P
}
private fun unit() {
private fun __dummyTestFun__() {
val t: MyClass.P = MyClass.P()
t
}
@@ -6,9 +6,9 @@ class A {
// SIBLING:
fun testProp() {
val foo = A()
unit(foo)
__dummyTestFun__(foo)
}
private fun unit(foo: A) {
private fun __dummyTestFun__(foo: A) {
foo()
}