From 1c05308c05f8fb1723b26917416472fc07b7aab2 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 4 Apr 2016 15:43:08 +0300 Subject: [PATCH] Minor. Fix testdata. --- .../candidatesPriority/wrongReceiverVsOtherError.resolve | 5 +++-- idea/testData/intentions/importMember/StaticJavaMethod.kt | 3 +-- .../intentions/importMember/StaticJavaMethod.kt.after | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve b/compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve index 36469cebc79..fab90bc42b9 100644 --- a/compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve +++ b/compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve @@ -8,8 +8,9 @@ open class B {} fun test(a: A, b: B) { with (a) { with (b) { - // at first we try b.foo, so 'Int.foo' should have less priority to be thrown away - `A.foo`foo(1.0) + // candidates with errors for receiver b going before candidates with errors for receiver a + // resolved to Int.foo with error: UNRESOLVED_REFERENCE_WRONG_RECEIVER + `!`foo(1.0) } } } diff --git a/idea/testData/intentions/importMember/StaticJavaMethod.kt b/idea/testData/intentions/importMember/StaticJavaMethod.kt index a8de632d9c1..95812f9bdd5 100644 --- a/idea/testData/intentions/importMember/StaticJavaMethod.kt +++ b/idea/testData/intentions/importMember/StaticJavaMethod.kt @@ -1,6 +1,5 @@ // INTENTION_TEXT: "Add import for 'javax.swing.SwingUtilities.invokeLater'" // WITH_RUNTIME -// ERROR: No value passed for parameter p0 // ERROR: Unresolved reference: SomethingElse // ERROR: Unresolved reference: somethingElse // SKIP_ERRORS_AFTER @@ -8,7 +7,7 @@ import javax.swing.SwingUtilities fun foo() { - SwingUtilities.invokeLater() + SwingUtilities.invokeLater {} } fun bar() { diff --git a/idea/testData/intentions/importMember/StaticJavaMethod.kt.after b/idea/testData/intentions/importMember/StaticJavaMethod.kt.after index 7a0320768d0..2ba63b22380 100644 --- a/idea/testData/intentions/importMember/StaticJavaMethod.kt.after +++ b/idea/testData/intentions/importMember/StaticJavaMethod.kt.after @@ -1,14 +1,14 @@ // INTENTION_TEXT: "Add import for 'javax.swing.SwingUtilities.invokeLater'" // WITH_RUNTIME -// ERROR: No value passed for parameter p0 // ERROR: Unresolved reference: SomethingElse // ERROR: Unresolved reference: somethingElse +// SKIP_ERRORS_AFTER import javax.swing.SwingUtilities import javax.swing.SwingUtilities.invokeLater fun foo() { - invokeLater() + invokeLater {} } fun bar() {