fix tests in org.jetbrains.kotlin.idea.refactoring.introduce

This commit is contained in:
Michael Nedzelsky
2015-09-04 23:49:10 +03:00
parent 92ca057b4a
commit daa1ac1918
44 changed files with 53 additions and 52 deletions
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, Any // PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, Any
// PARAM_DESCRIPTOR: internal fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
// SIBLING: // SIBLING:
fun <T> Array<T>.test() { fun <T> Array<T>.test() {
<selection>this.isEmpty()</selection> <selection>this.isEmpty()</selection>
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, Any // PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, Any
// PARAM_DESCRIPTOR: internal fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
// SIBLING: // SIBLING:
fun <T> Array<T>.test() { fun <T> Array<T>.test() {
__dummyTestFun__() __dummyTestFun__()
@@ -1 +1 @@
Following declarations are used outside of selected code fragment: public constructor A(n: Int = ...) value-parameter val n: Int = ... Following declarations are used outside of selected code fragment: constructor A(n: Int = ...) value-parameter val n: Int = ...
@@ -1,6 +1,7 @@
// SUGGESTED_NAMES: i, getKm // SUGGESTED_NAMES: i, getKm
// PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: internal final val meters: kotlin.Int? defined in A // PARAM_DESCRIPTOR: public final val meters: kotlin.Int? defined in A
class A { class A {
val meters: Int? = 1 val meters: Int? = 1
} }
@@ -1,6 +1,6 @@
// SUGGESTED_NAMES: i, getKm // SUGGESTED_NAMES: i, getKm
// PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: internal final val meters: kotlin.Int? defined in A // PARAM_DESCRIPTOR: public final val meters: kotlin.Int? defined in A
class A { class A {
val meters: Int? = 1 val meters: Int? = 1
} }
@@ -1,7 +1,7 @@
// WITH_RUNTIME // WITH_RUNTIME
// SUGGESTED_NAMES: i, getKm // SUGGESTED_NAMES: i, getKm
// PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: internal final val meters: kotlin.Int? defined in A // PARAM_DESCRIPTOR: public final val meters: kotlin.Int? defined in A
class A { class A {
val meters: Int? = 1 val meters: Int? = 1
} }
@@ -1,7 +1,7 @@
// WITH_RUNTIME // WITH_RUNTIME
// SUGGESTED_NAMES: i, getKm // SUGGESTED_NAMES: i, getKm
// PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: internal final val meters: kotlin.Int? defined in A // PARAM_DESCRIPTOR: public final val meters: kotlin.Int? defined in A
class A { class A {
val meters: Int? = 1 val meters: Int? = 1
} }
@@ -1,6 +1,6 @@
// SUGGESTED_NAMES: i, getKm // SUGGESTED_NAMES: i, getKm
// PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: internal val meters: kotlin.Int? defined in root package // PARAM_DESCRIPTOR: public val meters: kotlin.Int? defined in root package
val meters: Int? = 1 val meters: Int? = 1
fun test() { fun test() {
@@ -1,6 +1,6 @@
// SUGGESTED_NAMES: i, getKm // SUGGESTED_NAMES: i, getKm
// PARAM_TYPES: kotlin.Int // PARAM_TYPES: kotlin.Int
// PARAM_DESCRIPTOR: internal val meters: kotlin.Int? defined in root package // PARAM_DESCRIPTOR: public val meters: kotlin.Int? defined in root package
val meters: Int? = 1 val meters: Int? = 1
fun test() { fun test() {
@@ -3,5 +3,5 @@ interface T{
return i() return i()
} }
fun i() = 1 fun i(): Int = 1
} }
@@ -1,4 +1,4 @@
// PARAM_DESCRIPTOR: internal fun Bar.foo(): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun Bar.foo(): kotlin.Unit defined in root package
// PARAM_TYPES: Bar, Foo, kotlin.Any // PARAM_TYPES: Bar, Foo, kotlin.Any
open class Foo open class Foo
@@ -1,4 +1,4 @@
// PARAM_DESCRIPTOR: internal fun Bar.foo(): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun Bar.foo(): kotlin.Unit defined in root package
// PARAM_TYPES: Bar, Foo, kotlin.Any // PARAM_TYPES: Bar, Foo, kotlin.Any
open class Foo open class Foo
@@ -1,5 +1,5 @@
// PARAM_TYPES: Z // PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package // PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int) class Z(val a: Int)
// SIBLING: // SIBLING:
@@ -1,5 +1,5 @@
// PARAM_TYPES: Z // PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package // PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int) class Z(val a: Int)
// SIBLING: // SIBLING:
@@ -1,5 +1,5 @@
// SUGGESTED_NAMES: i, getB // SUGGESTED_NAMES: i, getB
// PARAM_DESCRIPTOR: internal fun A.ext(): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
// PARAM_TYPES: B // PARAM_TYPES: B
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a: A = B() val a: A = B()
@@ -1,5 +1,5 @@
// SUGGESTED_NAMES: i, getB // SUGGESTED_NAMES: i, getB
// PARAM_DESCRIPTOR: internal fun A.ext(): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
// PARAM_TYPES: B // PARAM_TYPES: B
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a: A = B() val a: A = B()
@@ -1,5 +1,5 @@
// PARAM_TYPES: Z // PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package // PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int) class Z(val a: Int)
// SIBLING: // SIBLING:
@@ -1,5 +1,5 @@
// PARAM_TYPES: Z // PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package // PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int) class Z(val a: Int)
// SIBLING: // SIBLING:
@@ -1,5 +1,5 @@
// PARAM_TYPES: Z // PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package // PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int) class Z(val a: Int)
// SIBLING: // SIBLING:
@@ -1,5 +1,5 @@
// PARAM_TYPES: Z // PARAM_TYPES: Z
// PARAM_DESCRIPTOR: internal fun Z.foo(): kotlin.Int defined in root package // PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
class Z(val a: Int) class Z(val a: Int)
// SIBLING: // SIBLING:
@@ -1,5 +1,5 @@
// SUGGESTED_NAMES: i, getB // SUGGESTED_NAMES: i, getB
// PARAM_DESCRIPTOR: internal fun A.ext(): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
// PARAM_TYPES: B // PARAM_TYPES: B
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a: A = B() val a: A = B()
@@ -1,5 +1,5 @@
// SUGGESTED_NAMES: i, getB // SUGGESTED_NAMES: i, getB
// PARAM_DESCRIPTOR: internal fun A.ext(): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
// PARAM_TYPES: B // PARAM_TYPES: B
fun main(args: Array<String>) { fun main(args: Array<String>) {
val a: A = B() val a: A = B()
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.String // PARAM_TYPES: kotlin.String
// PARAM_DESCRIPTOR: internal final fun kotlin.String.foo(): kotlin.Unit defined in X // PARAM_DESCRIPTOR: public final fun kotlin.String.foo(): kotlin.Unit defined in X
fun print(a: Any) { fun print(a: Any) {
@@ -1,5 +1,5 @@
// PARAM_TYPES: kotlin.String // PARAM_TYPES: kotlin.String
// PARAM_DESCRIPTOR: internal final fun kotlin.String.foo(): kotlin.Unit defined in X // PARAM_DESCRIPTOR: public final fun kotlin.String.foo(): kotlin.Unit defined in X
fun print(a: Any) { fun print(a: Any) {
@@ -1,7 +1,7 @@
// PARAM_TYPES: A // PARAM_TYPES: A
// PARAM_TYPES: B // PARAM_TYPES: B
// PARAM_DESCRIPTOR: internal final class A defined in root package // PARAM_DESCRIPTOR: public final class A defined in root package
// PARAM_DESCRIPTOR: internal final fun B.foo(): Int defined in A // PARAM_DESCRIPTOR: public final fun B.foo(): Int defined in A
// SIBLING: // SIBLING:
class A { class A {
val a = 1 val a = 1
@@ -1,7 +1,7 @@
// PARAM_TYPES: A // PARAM_TYPES: A
// PARAM_TYPES: B // PARAM_TYPES: B
// PARAM_DESCRIPTOR: internal final class A defined in root package // PARAM_DESCRIPTOR: public final class A defined in root package
// PARAM_DESCRIPTOR: internal final fun B.foo(): Int defined in A // PARAM_DESCRIPTOR: public final fun B.foo(): Int defined in A
// SIBLING: // SIBLING:
class A { class A {
val a = 1 val a = 1
@@ -1,4 +1,4 @@
// PARAM_DESCRIPTOR: internal fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo // PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo
// PARAM_TYPES: kotlin.String.() -> kotlin.Unit // PARAM_TYPES: kotlin.String.() -> kotlin.Unit
// PARAM_TYPES: kotlin.String // PARAM_TYPES: kotlin.String
@@ -1,4 +1,4 @@
// PARAM_DESCRIPTOR: internal fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo // PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo
// PARAM_TYPES: kotlin.String.() -> kotlin.Unit // PARAM_TYPES: kotlin.String.() -> kotlin.Unit
// PARAM_TYPES: kotlin.String // PARAM_TYPES: kotlin.String
@@ -1,4 +1,4 @@
// PARAM_DESCRIPTOR: internal fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo // PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo
// PARAM_TYPES: kotlin.String.() -> kotlin.Unit // PARAM_TYPES: kotlin.String.() -> kotlin.Unit
// PARAM_TYPES: kotlin.String // PARAM_TYPES: kotlin.String
@@ -1,4 +1,4 @@
// PARAM_DESCRIPTOR: internal fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package // PARAM_DESCRIPTOR: public fun (kotlin.String.() -> kotlin.Unit).foo(a: kotlin.String): kotlin.Unit defined in root package
// PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo // PARAM_DESCRIPTOR: value-parameter val a: kotlin.String defined in foo
// PARAM_TYPES: kotlin.String.() -> kotlin.Unit // PARAM_TYPES: kotlin.String.() -> kotlin.Unit
// PARAM_TYPES: kotlin.String // PARAM_TYPES: kotlin.String
@@ -1,7 +1,7 @@
// PARAM_TYPES: X // PARAM_TYPES: X
// PARAM_TYPES: Y // PARAM_TYPES: Y
// PARAM_DESCRIPTOR: internal final fun X.test(): kotlin.Unit defined in Y // PARAM_DESCRIPTOR: public final fun X.test(): kotlin.Unit defined in Y
// PARAM_DESCRIPTOR: internal final class Y defined in root package // PARAM_DESCRIPTOR: public final class Y defined in root package
class X(val x: Int) class X(val x: Int)
// SIBLING: // SIBLING:
@@ -1,7 +1,7 @@
// PARAM_TYPES: X // PARAM_TYPES: X
// PARAM_TYPES: Y // PARAM_TYPES: Y
// PARAM_DESCRIPTOR: internal final fun X.test(): kotlin.Unit defined in Y // PARAM_DESCRIPTOR: public final fun X.test(): kotlin.Unit defined in Y
// PARAM_DESCRIPTOR: internal final class Y defined in root package // PARAM_DESCRIPTOR: public final class Y defined in root package
class X(val x: Int) class X(val x: Int)
// SIBLING: // SIBLING:
@@ -7,7 +7,7 @@
import java.util.* import java.util.*
// SIBLING: // SIBLING:
class Foo<T> { internal class Foo<T> {
val map = HashMap<String, T>() val map = HashMap<String, T>()
fun test(l: String): T { fun test(l: String): T {
@@ -7,7 +7,7 @@
import java.util.* import java.util.*
// SIBLING: // SIBLING:
class Foo<T> { internal class Foo<T> {
val map = HashMap<String, T>() val map = HashMap<String, T>()
fun test(l: String): T { fun test(l: String): T {
@@ -1,8 +1,8 @@
// PARAM_TYPES: A<T> // PARAM_TYPES: A<T>
// PARAM_TYPES: A.B<U> // PARAM_TYPES: A.B<U>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package // PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
// PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A // PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
open class Data(val x: Int) open class Data(val x: Int)
interface DataEx interface DataEx
@@ -1,8 +1,8 @@
// PARAM_TYPES: A<T> // PARAM_TYPES: A<T>
// PARAM_TYPES: A.B<U> // PARAM_TYPES: A.B<U>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package // PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
// PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A // PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
open class Data(val x: Int) open class Data(val x: Int)
interface DataEx interface DataEx
@@ -1,6 +1,6 @@
// PARAM_TYPES: A.B<U> // PARAM_TYPES: A.B<U>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A // PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
open class Data(val x: Int) open class Data(val x: Int)
interface DataEx interface DataEx
@@ -1,6 +1,6 @@
// PARAM_TYPES: A.B<U> // PARAM_TYPES: A.B<U>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A // PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
open class Data(val x: Int) open class Data(val x: Int)
interface DataEx interface DataEx
@@ -1,8 +1,8 @@
// PARAM_TYPES: A<T> // PARAM_TYPES: A<T>
// PARAM_TYPES: A.B<U> // PARAM_TYPES: A.B<U>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final class A<T : Data> defined in root package // PARAM_DESCRIPTOR: public final class A<T : Data> defined in root package
// PARAM_DESCRIPTOR: internal final inner class B<U : Data> defined in A // PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
open class Data(val x: Int) open class Data(val x: Int)
@@ -1,8 +1,8 @@
// PARAM_TYPES: A<T> // PARAM_TYPES: A<T>
// PARAM_TYPES: A.B<U> // PARAM_TYPES: A.B<U>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final class A<T : Data> defined in root package // PARAM_DESCRIPTOR: public final class A<T : Data> defined in root package
// PARAM_DESCRIPTOR: internal final inner class B<U : Data> defined in A // PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
open class Data(val x: Int) open class Data(val x: Int)
@@ -1,6 +1,6 @@
// PARAM_TYPES: A.B<U> // PARAM_TYPES: A.B<U>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final inner class B<U : Data> defined in A // PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
open class Data(val x: Int) open class Data(val x: Int)
@@ -1,6 +1,6 @@
// PARAM_TYPES: A.B<U> // PARAM_TYPES: A.B<U>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final inner class B<U : Data> defined in A // PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
open class Data(val x: Int) open class Data(val x: Int)
@@ -1,6 +1,6 @@
// PARAM_TYPES: A<T> // PARAM_TYPES: A<T>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package // PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo
open class Data(val x: Int) open class Data(val x: Int)
interface DataEx interface DataEx
@@ -1,6 +1,6 @@
// PARAM_TYPES: A<T> // PARAM_TYPES: A<T>
// PARAM_TYPES: V, Data // PARAM_TYPES: V, Data
// PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package // PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
// PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo
open class Data(val x: Int) open class Data(val x: Int)
interface DataEx interface DataEx