diff --git a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt index 3d7c1421596..cb663ef615a 100644 --- a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt +++ b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt @@ -8,6 +8,4 @@ fun bar(a: A, b: B) { with (a) { b.foo() } -} - -fun with(receiver: T, f: T.() -> R) : R = receiver.f() +} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.txt b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.txt index 092d4a8dea5..57472a0b1c7 100644 --- a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.txt +++ b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.txt @@ -10,8 +10,6 @@ fun bar(a: A, b: B) { } } -fun with(receiver: T, f: T.() -> R) : R = receiver.f() - Resolved call: diff --git a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt index 537c53ec85a..270a1d8b7e4 100644 --- a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt +++ b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt @@ -10,6 +10,4 @@ fun bar(a: A, b: B) { foo() } } -} - -fun with(receiver: T, f: T.() -> R) : R = receiver.f() +} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt index ff394c9abbd..c218f81b453 100644 --- a/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt +++ b/compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.txt @@ -12,8 +12,6 @@ fun bar(a: A, b: B) { } } -fun with(receiver: T, f: T.() -> R) : R = receiver.f() - Resolved call: diff --git a/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt b/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt index 69c572f9a12..3b7ac8eb1ca 100644 --- a/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt +++ b/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt @@ -6,6 +6,4 @@ fun bar(f: Foo, i: Int) { with (i) { f() } -} - -fun with(receiver: T, f: T.() -> R) : R = throw Exception() \ No newline at end of file +} \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt b/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt index 0737d204702..6048e3eb53e 100644 --- a/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt +++ b/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt @@ -8,8 +8,6 @@ fun bar(f: Foo, i: Int) { } } -fun with(receiver: T, f: T.() -> R) : R = throw Exception() - Resolved call: diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index c159b38d7fd..4b25ea55fe0 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver public abstract class AbstractResolvedCallsTest() : JetLiteFixture() { - override fun createEnvironment(): JetCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY) + override fun createEnvironment(): JetCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.ALL) public fun doTest(filePath: String) { val text = JetTestUtils.doLoadFile(File(filePath))!!