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

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

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt.after
+2 -2
View File
@@ -5,10 +5,10 @@
// SIBLING:
val x = object {
fun test() {
unit()
__dummyTestFun__()
}
}
private fun Any.unit() {
private fun Any.__dummyTestFun__() {
println(this)
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt.after
+2 -2
View File
@@ -13,9 +13,9 @@ fun foo(a: A) {
// SIBLING:
fun test() {
val x = object: A() { }
unit(x)
__dummyTestFun__(x)
}
private fun unit(x: A) {
private fun __dummyTestFun__(x: A) {
foo(x)
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
+2 -2
View File
@@ -11,10 +11,10 @@ class X<T> {
// SIBLING:
fun foo(s: String?, x: X<Any>) {
when {
s != null -> unit(s, x)
s != null -> __dummyTestFun__(s, x)
}
}
private fun unit(s: String, x: X<Any>) {
private fun __dummyTestFun__(s: String, x: X<Any>) {
x.add(s)
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
+2 -2
View File
@@ -11,10 +11,10 @@ class X<T> {
// SIBLING:
fun foo(s: String?, x: X<Any?>) {
when {
s != null -> unit(s, x)
s != null -> __dummyTestFun__(s, x)
}
}
private fun unit(s: String?, x: X<Any?>) {
private fun __dummyTestFun__(s: String?, x: X<Any?>) {
x.add(s)
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after
+2 -2
View File
@@ -30,11 +30,11 @@ class C: AImpl(), B {
// SIBLING:
fun foo(c: C) {
unit(c)
__dummyTestFun__(c)
c.doB()
c.doC()
}
private fun unit(c: C) {
private fun __dummyTestFun__(c: C) {
c.doA()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after
+2 -2
View File
@@ -31,10 +31,10 @@ class C: AImpl(), B {
// SIBLING:
fun foo(c: C) {
c.doA()
unit(c)
__dummyTestFun__(c)
c.doC()
}
private fun unit(c: C) {
private fun __dummyTestFun__(c: C) {
c.doB()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after
+2 -2
View File
@@ -32,9 +32,9 @@ class C: AImpl(), B {
fun foo(c: C) {
c.doA()
c.doB()
unit(c)
__dummyTestFun__(c)
}
private fun unit(c: C) {
private fun __dummyTestFun__(c: C) {
c.doC()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after
+2 -2
View File
@@ -30,11 +30,11 @@ class C: AImpl(), B {
// SIBLING:
fun foo(c: C) {
unit(c)
__dummyTestFun__(c)
c.doC()
}
private fun unit(c: C) {
private fun __dummyTestFun__(c: C) {
c.doA()
c.doB()
}
idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
+2 -2
View File
@@ -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
}
idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt.after
+2 -2
View File
@@ -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
}
idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after
+2 -2
View File
@@ -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
}
idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt.after
+2 -2
View File
@@ -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
}
idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt.after
+2 -2
View File
@@ -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
}
idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt.after
+2 -2
View File
@@ -6,11 +6,11 @@ fun foo() = 1
// SIBLING:
class MyClass {
fun test() {
unit()
__dummyTestFun__()
}
}
private fun unit() {
private fun __dummyTestFun__() {
foo()
a
}
idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt.after
+2 -2
View File
@@ -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
}
idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt.after
+2 -2
View File
@@ -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)
}
idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt.after
+2 -2
View File
@@ -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
}
idea/testData/refactoring/extractFunction/parameters/misc/thisInObject.kt.after
+2 -2
View File
@@ -4,10 +4,10 @@ package p
object O {
val a = 1
fun test() {
unit()
__dummyTestFun__()
}
}
private fun unit() {
private fun __dummyTestFun__() {
O.a
}
idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt.after
+2 -2
View File
@@ -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
}
idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after
+2 -2
View File
@@ -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()
}