diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java index c82341fd35a..0b56bcef2a1 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java @@ -75,9 +75,13 @@ public class ConfigLibraryUtil { PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()), module); } + public static void unConfigureKotlinRuntime(Module module) { + removeLibrary(module, DEFAULT_JAVA_RUNTIME_LIB_NAME); + } + public static void unConfigureKotlinRuntimeAndSdk(Module module, Sdk sdk) { configureSdk(module, sdk); - removeLibrary(module, DEFAULT_JAVA_RUNTIME_LIB_NAME); + unConfigureKotlinRuntime(module); } public static void unConfigureKotlinJsRuntimeAndSdk(Module module, Sdk sdk) { diff --git a/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberAfter.kt b/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberAfter.kt index 02e7d9dc22b..836a4f03d2b 100644 --- a/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberAfter.kt +++ b/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberAfter.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { X(0).foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberBefore.kt b/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberBefore.kt index 8bee8085759..9bc48d1baa1 100644 --- a/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberBefore.kt +++ b/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberBefore.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberConflictBefore.kt b/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberConflictBefore.kt index ac8e6a3e0bc..96f7564a54b 100644 --- a/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberConflictBefore.kt +++ b/idea/testData/refactoring/changeSignature/AddNewReceiverForMemberConflictBefore.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { A(3).foo("1", 2) with(A(3)) { diff --git a/idea/testData/refactoring/changeSignature/AddPropertyReceiverAfter.kt b/idea/testData/refactoring/changeSignature/AddPropertyReceiverAfter.kt index 00849aca7fe..93f7b16fbf2 100644 --- a/idea/testData/refactoring/changeSignature/AddPropertyReceiverAfter.kt +++ b/idea/testData/refactoring/changeSignature/AddPropertyReceiverAfter.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - open class A { open var String.p: Int = 1 } diff --git a/idea/testData/refactoring/changeSignature/AddPropertyReceiverBefore.kt b/idea/testData/refactoring/changeSignature/AddPropertyReceiverBefore.kt index 91ff2d398d3..0c8bf6c37be 100644 --- a/idea/testData/refactoring/changeSignature/AddPropertyReceiverBefore.kt +++ b/idea/testData/refactoring/changeSignature/AddPropertyReceiverBefore.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - open class A { open var p: Int = 1 } diff --git a/idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverAfter.kt b/idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverAfter.kt index 5a3370a1688..06d1c4d7a89 100644 --- a/idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverAfter.kt +++ b/idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverAfter.kt @@ -1,7 +1,5 @@ package test -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class A open var A.p: Int diff --git a/idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverBefore.kt b/idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverBefore.kt index f6f59b884c8..07d369cb80e 100644 --- a/idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverBefore.kt +++ b/idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverBefore.kt @@ -1,7 +1,5 @@ package test -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class A open var p: Int diff --git a/idea/testData/refactoring/changeSignature/ChangePropertyAfter.kt b/idea/testData/refactoring/changeSignature/ChangePropertyAfter.kt index f7b717b2fb5..a4165ad686c 100644 --- a/idea/testData/refactoring/changeSignature/ChangePropertyAfter.kt +++ b/idea/testData/refactoring/changeSignature/ChangePropertyAfter.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - open class A { open var s: String = 1 } diff --git a/idea/testData/refactoring/changeSignature/ChangePropertyBefore.kt b/idea/testData/refactoring/changeSignature/ChangePropertyBefore.kt index 91ff2d398d3..0c8bf6c37be 100644 --- a/idea/testData/refactoring/changeSignature/ChangePropertyBefore.kt +++ b/idea/testData/refactoring/changeSignature/ChangePropertyBefore.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - open class A { open var p: Int = 1 } diff --git a/idea/testData/refactoring/changeSignature/ChangePropertyReceiverAfter.kt b/idea/testData/refactoring/changeSignature/ChangePropertyReceiverAfter.kt index 25db53affdd..49935d45f6a 100644 --- a/idea/testData/refactoring/changeSignature/ChangePropertyReceiverAfter.kt +++ b/idea/testData/refactoring/changeSignature/ChangePropertyReceiverAfter.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - open class A { open var Int.p: Int = 1 } diff --git a/idea/testData/refactoring/changeSignature/ChangePropertyReceiverBefore.kt b/idea/testData/refactoring/changeSignature/ChangePropertyReceiverBefore.kt index ce2ebcfbcb3..7c4d9d1f6a8 100644 --- a/idea/testData/refactoring/changeSignature/ChangePropertyReceiverBefore.kt +++ b/idea/testData/refactoring/changeSignature/ChangePropertyReceiverBefore.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - open class A { open var String.p: Int = 1 } diff --git a/idea/testData/refactoring/changeSignature/ChangeReceiverForMemberAfter.kt b/idea/testData/refactoring/changeSignature/ChangeReceiverForMemberAfter.kt index dd5693c7cf5..5e56e9b277f 100644 --- a/idea/testData/refactoring/changeSignature/ChangeReceiverForMemberAfter.kt +++ b/idea/testData/refactoring/changeSignature/ChangeReceiverForMemberAfter.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { "1".foo(X(0), 2) diff --git a/idea/testData/refactoring/changeSignature/ChangeReceiverForMemberBefore.kt b/idea/testData/refactoring/changeSignature/ChangeReceiverForMemberBefore.kt index d060a9a79b0..68a7d9ee4cd 100644 --- a/idea/testData/refactoring/changeSignature/ChangeReceiverForMemberBefore.kt +++ b/idea/testData/refactoring/changeSignature/ChangeReceiverForMemberBefore.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { X(0).foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverAfter.kt b/idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverAfter.kt index 05320988e3e..98bc45e80aa 100644 --- a/idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverAfter.kt +++ b/idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverAfter.kt @@ -1,7 +1,5 @@ package test -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class A open var String.p: Int diff --git a/idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverBefore.kt b/idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverBefore.kt index b4e977e4dae..6409c1e6161 100644 --- a/idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverBefore.kt +++ b/idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverBefore.kt @@ -1,7 +1,5 @@ package test -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class A open var A.p: Int diff --git a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1After.kt b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1After.kt index 6b798781745..94a8cb8f405 100644 --- a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1After.kt +++ b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1After.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { X(0).foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1Before.kt b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1Before.kt index 83380e604e5..c2c9d2a5f7e 100644 --- a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1Before.kt +++ b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1Before.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { foo(X(0), "1", 2) diff --git a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2After.kt b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2After.kt index 6b798781745..94a8cb8f405 100644 --- a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2After.kt +++ b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2After.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { X(0).foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2Before.kt b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2Before.kt index fc7e4af4155..2c989542fc2 100644 --- a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2Before.kt +++ b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2Before.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { foo("1", X(0), 2) diff --git a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMemberConflictBefore.kt b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMemberConflictBefore.kt index f7becab2f20..8f3c5b279f3 100644 --- a/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMemberConflictBefore.kt +++ b/idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMemberConflictBefore.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { A(3).foo(X(0), "1", 2) with(A(3)) { diff --git a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1After.kt b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1After.kt index 1c2c834e0ae..8c727429e41 100644 --- a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1After.kt +++ b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1After.kt @@ -4,8 +4,6 @@ fun foo(x: X, s: String, k: Int): Boolean { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { foo(X(0), "1", 2) with(X(0)) { diff --git a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1Before.kt b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1Before.kt index 89dfc45f171..c028422d119 100644 --- a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1Before.kt +++ b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1Before.kt @@ -4,8 +4,6 @@ fun X.foo(s: String, k: Int): Boolean { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { X(0).foo("1", 2) with(X(0)) { diff --git a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2After.kt b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2After.kt index 955e65ba1a2..6d447bc182f 100644 --- a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2After.kt +++ b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2After.kt @@ -4,8 +4,6 @@ fun foo(s: String, x: X, k: Int): Boolean { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { foo("1", X(0), 2) with(X(0)) { diff --git a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2Before.kt b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2Before.kt index 89dfc45f171..c028422d119 100644 --- a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2Before.kt +++ b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2Before.kt @@ -4,8 +4,6 @@ fun X.foo(s: String, k: Int): Boolean { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { X(0).foo("1", 2) with(X(0)) { diff --git a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1After.kt b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1After.kt index 010d29db62b..3ceaa97d764 100644 --- a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1After.kt +++ b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1After.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { foo(X(0), "1", 2) diff --git a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1Before.kt b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1Before.kt index d060a9a79b0..68a7d9ee4cd 100644 --- a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1Before.kt +++ b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1Before.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { X(0).foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2After.kt b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2After.kt index 374a0883337..c0d6971ad61 100644 --- a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2After.kt +++ b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2After.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { foo("1", X(0), 2) diff --git a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2Before.kt b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2Before.kt index d060a9a79b0..68a7d9ee4cd 100644 --- a/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2Before.kt +++ b/idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2Before.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { X(0).foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversAfter.kt b/idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversAfter.kt index 80691eac044..df8c62e8664 100644 --- a/idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversAfter.kt +++ b/idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversAfter.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class C { fun String.foo() { with(1) { diff --git a/idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversBefore.kt b/idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversBefore.kt index f94ad72daf1..841f35b5cfc 100644 --- a/idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversBefore.kt +++ b/idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversBefore.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class C { fun foo(s: String) { with(1) { diff --git a/idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversAfter.kt b/idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversAfter.kt index 3e4ed121d52..f32f2107a6a 100644 --- a/idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversAfter.kt +++ b/idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversAfter.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class C { fun foo(s: String) { with(1) { diff --git a/idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversBefore.kt b/idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversBefore.kt index 0d5c40e17e0..4405bab7eab 100644 --- a/idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversBefore.kt +++ b/idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversBefore.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class C { fun String.foo() { with(1) { diff --git a/idea/testData/refactoring/changeSignature/RemovePropertyReceiverAfter.kt b/idea/testData/refactoring/changeSignature/RemovePropertyReceiverAfter.kt index 36b84eef02a..d3f6580f2b3 100644 --- a/idea/testData/refactoring/changeSignature/RemovePropertyReceiverAfter.kt +++ b/idea/testData/refactoring/changeSignature/RemovePropertyReceiverAfter.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - open class A { open var p: Int = 1 } diff --git a/idea/testData/refactoring/changeSignature/RemovePropertyReceiverBefore.kt b/idea/testData/refactoring/changeSignature/RemovePropertyReceiverBefore.kt index ce2ebcfbcb3..7c4d9d1f6a8 100644 --- a/idea/testData/refactoring/changeSignature/RemovePropertyReceiverBefore.kt +++ b/idea/testData/refactoring/changeSignature/RemovePropertyReceiverBefore.kt @@ -1,5 +1,3 @@ -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - open class A { open var String.p: Int = 1 } diff --git a/idea/testData/refactoring/changeSignature/RemoveReceiverAfter.kt b/idea/testData/refactoring/changeSignature/RemoveReceiverAfter.kt index 43e8dfac069..fa4b033913a 100644 --- a/idea/testData/refactoring/changeSignature/RemoveReceiverAfter.kt +++ b/idea/testData/refactoring/changeSignature/RemoveReceiverAfter.kt @@ -4,8 +4,6 @@ fun foo(s: String, k: Int): Boolean { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(X(0)) { foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/RemoveReceiverBefore.kt b/idea/testData/refactoring/changeSignature/RemoveReceiverBefore.kt index 708058dead2..cdd97a49a8e 100644 --- a/idea/testData/refactoring/changeSignature/RemoveReceiverBefore.kt +++ b/idea/testData/refactoring/changeSignature/RemoveReceiverBefore.kt @@ -4,8 +4,6 @@ fun X.foo(s: String, k: Int): Boolean { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(X(0)) { foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/RemoveReceiverForMemberAfter.kt b/idea/testData/refactoring/changeSignature/RemoveReceiverForMemberAfter.kt index 286bd9187d2..d9e79178b8c 100644 --- a/idea/testData/refactoring/changeSignature/RemoveReceiverForMemberAfter.kt +++ b/idea/testData/refactoring/changeSignature/RemoveReceiverForMemberAfter.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/RemoveReceiverForMemberBefore.kt b/idea/testData/refactoring/changeSignature/RemoveReceiverForMemberBefore.kt index fadc2fb4315..b0c74fcc828 100644 --- a/idea/testData/refactoring/changeSignature/RemoveReceiverForMemberBefore.kt +++ b/idea/testData/refactoring/changeSignature/RemoveReceiverForMemberBefore.kt @@ -10,8 +10,6 @@ class A(val k: Int) { class X(val k: Int) -fun with(receiver: T, f: T.() -> R): R = receiver.f() - fun test() { with(A(3)) { X(0).foo("1", 2) diff --git a/idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverAfter.kt b/idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverAfter.kt index 09ac893e96e..319f46325c0 100644 --- a/idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverAfter.kt +++ b/idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverAfter.kt @@ -1,7 +1,5 @@ package test -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class A open var p: Int diff --git a/idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverBefore.kt b/idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverBefore.kt index b4e977e4dae..6409c1e6161 100644 --- a/idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverBefore.kt +++ b/idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverBefore.kt @@ -1,7 +1,5 @@ package test -public inline fun with(receiver: T, f: T.() -> R): R = receiver.f() - class A open var A.p: Int diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java index 36b7e13677f..98b38f63b02 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java @@ -47,6 +47,7 @@ import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinMethodNode; import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex; import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex; +import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; @@ -1348,13 +1349,15 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { protected void setUp() throws Exception { super.setUp(); editors = new ArrayList(); + ConfigLibraryUtil.configureKotlinRuntime(getModule()); } @Override protected void tearDown() throws Exception { - super.tearDown(); + ConfigLibraryUtil.unConfigureKotlinRuntime(getModule()); editors.clear(); editors = null; + super.tearDown(); } @NotNull