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

Extract Function: Keep track of original parameter descriptors

Browse Source
This commit is contained in:
Alexey Sedunov
2014-07-01 14:23:59 +04:00
parent 09a1a8ce8f
commit 3e3918ab6e
191 changed files with 328 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, kotlin.Any
// PARAM_TYPES: X<kotlin.Any>
// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter val x: X<kotlin.Any> defined in foo
class X<T> {
fun add(t: T) {
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, kotlin.Any
// PARAM_TYPES: X<kotlin.Any>
// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter val x: X<kotlin.Any> defined in foo
class X<T> {
fun add(t: T) {
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, kotlin.Any?
// PARAM_TYPES: X<kotlin.Any?>
// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter val x: X<kotlin.Any?> defined in foo
class X<T> {
fun add(t: T) {
idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, kotlin.Any?
// PARAM_TYPES: X<kotlin.Any?>
// PARAM_DESCRIPTOR: value-parameter val s: kotlin.String? defined in foo
// PARAM_DESCRIPTOR: value-parameter val x: X<kotlin.Any?> defined in foo
class X<T> {
fun add(t: T) {
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt
+1
View File
@@ -1,4 +1,5 @@
//PARAM_TYPES: C, AImpl, A
//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
trait A {
fun doA()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after
+1
View File
@@ -1,4 +1,5 @@
//PARAM_TYPES: C, AImpl, A
//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
trait A {
fun doA()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt
+1
View File
@@ -1,4 +1,5 @@
//PARAM_TYPES: C, B
//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
trait A {
fun doA()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after
+1
View File
@@ -1,4 +1,5 @@
//PARAM_TYPES: C, B
//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
trait A {
fun doA()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt
+1
View File
@@ -1,4 +1,5 @@
//PARAM_TYPES: C
//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
trait A {
fun doA()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after
+1
View File
@@ -1,4 +1,5 @@
//PARAM_TYPES: C
//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
trait A {
fun doA()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt
+1
View File
@@ -1,4 +1,5 @@
//PARAM_TYPES: C
//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
trait A {
fun doA()
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after
+1
View File
@@ -1,4 +1,5 @@
//PARAM_TYPES: C
//PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
trait A {
fun doA()
}
idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: A.B
// PARAM_DESCRIPTOR: public final class A : Z defined in root package
// PARAM_DESCRIPTOR: public final inner class B : Z defined in A
public open class Z {
val z: Int = 0
}
idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: A.B
// PARAM_DESCRIPTOR: public final class A : Z defined in root package
// PARAM_DESCRIPTOR: public final inner class B : Z defined in A
public open class Z {
val z: Int = 0
}
idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int)
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int)
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: A.B
// PARAM_DESCRIPTOR: public final class A : Z defined in root package
// PARAM_DESCRIPTOR: public final inner class B : Z defined in A
public open class Z {
val z: Int = 0
}
idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: A.B
// PARAM_DESCRIPTOR: public final class A : Z defined in root package
// PARAM_DESCRIPTOR: public final inner class B : Z defined in A
public open class Z {
val z: Int = 0
}
idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: A.B
// PARAM_DESCRIPTOR: public final class A : Z defined in root package
// PARAM_DESCRIPTOR: public final inner class B : Z defined in A
public open class Z {
val z: Int = 0
}
idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: A.B
// PARAM_DESCRIPTOR: public final class A : Z defined in root package
// PARAM_DESCRIPTOR: public final inner class B : Z defined in A
public open class Z {
val z: Int = 0
}
idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int)
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int)
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int)
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int)
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: A.B
// PARAM_DESCRIPTOR: public final class A : Z defined in root package
// PARAM_DESCRIPTOR: public final inner class B : Z defined in A
public open class Z {
val z: Int = 0
}
idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after
+2
View File
@@ -1,5 +1,7 @@
// PARAM_TYPES: A
// PARAM_TYPES: A.B
// PARAM_DESCRIPTOR: public final class A : Z defined in root package
// PARAM_DESCRIPTOR: public final inner class B : Z defined in A
public open class Z {
val z: Int = 0
}
idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo.<anonymous>.<anonymous>
fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo.<anonymous>.<anonymous>
fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Array<kotlin.Int>
// PARAM_DESCRIPTOR: value-parameter val t: kotlin.Array<kotlin.Int> defined in foo
fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Array<kotlin.Int>
// PARAM_DESCRIPTOR: value-parameter val t: kotlin.Array<kotlin.Int> defined in foo
fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Array<kotlin.Int>
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Array<kotlin.Int> defined in foo.<anonymous>
fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Array<kotlin.Int>
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Array<kotlin.Int> defined in foo.<anonymous>
fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo.<anonymous>
fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Int defined in foo.<anonymous>
fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
// SIBLING:
idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
// PARAM_DESCRIPTOR: val a: kotlin.Int defined in main
// SIBLING:
fun main(args: Array<String>) {
val (a, b) = Data(1, 2)
idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, Any
// PARAM_DESCRIPTOR: val a: kotlin.Int defined in main
// SIBLING:
fun main(args: Array<String>) {
val (a, b) = Data(1, 2)
idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt
+3
View File
@@ -1,6 +1,9 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val c: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int, b: Int, c: Int): Int {
return <selection>(a + b*a - c) + b*c</selection>
idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after
+3
View File
@@ -1,6 +1,9 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val c: kotlin.Int defined in foo
// SIBLING:
fun foo(a: Int, b: Int, c: Int): Int {
return i(a, b, c)
idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt
+4
View File
@@ -2,6 +2,10 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter val a: A defined in foo
// PARAM_DESCRIPTOR: val t: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val u: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val x: kotlin.Int defined in foo
// SIBLING:
public class A() {
fun bar(a: Int, b: Int): Int {
idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after
+4
View File
@@ -2,6 +2,10 @@
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: value-parameter val a: A defined in foo
// PARAM_DESCRIPTOR: val t: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: val u: kotlin.Int defined in foo
// PARAM_DESCRIPTOR: value-parameter val x: kotlin.Int defined in foo
// SIBLING:
public class A() {
fun bar(a: Int, b: Int): Int {
idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: A
// PARAM_DESCRIPTOR: val foo: A defined in testProp
class A {
fun invoke() = 20
}
idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after
+1
View File
@@ -1,4 +1,5 @@
// PARAM_TYPES: A
// PARAM_DESCRIPTOR: val foo: A defined in testProp
class A {
fun invoke() = 20
}