From e3a98f4209d8f5649782f6f9303925c4176cb4a4 Mon Sep 17 00:00:00 2001 From: Frederik Haselmeier Date: Wed, 5 Jun 2024 19:34:03 +0200 Subject: [PATCH] [Kotlin] Deleted quick-fix tests for fully qualifying calls with ambiguous resolution. This is no longer needed when using JPS 2.0 because the K2 compiler has changed the resolution to the new way. KTIJ-30704 (cherry picked from commit 98f33cb4238b9c2ad50e5ca40bf1ef9cfd7ca1b2) GitOrigin-RevId: 9c29f53dfd939a542cc22a38e0b11f424c8a44c0 --- .../quickfix/K1QuickFixTestGenerated.java | 29 ------------------- .../addAnnotationTarget/use-site_invalid.kt | 1 + .../FunctionCallInsideObject.kt | 16 ---------- .../FunctionCallInsideObject.kt.after | 16 ---------- .../useFullyqualifiedCall/NestedObject.kt | 18 ------------ .../NestedObject.kt.after | 18 ------------ .../NestedObjectInRoot.kt | 16 ---------- .../NestedObjectInRoot.kt.after | 16 ---------- 8 files changed, 1 insertion(+), 129 deletions(-) delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt.after delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObject.kt delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObject.kt.after delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt.after diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java index 2af6e0d444e0..0fc6da734a2d 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java @@ -19504,35 +19504,6 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest { } } - @RunWith(JUnit3RunnerWithInners.class) - @TestMetadata("testData/quickfix/useFullyqualifiedCall") - public static class UseFullyqualifiedCall extends AbstractK1QuickFixTest { - @java.lang.Override - @org.jetbrains.annotations.NotNull - public final KotlinPluginMode getPluginMode() { - return KotlinPluginMode.K1; - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - @TestMetadata("FunctionCallInsideObject.kt") - public void testFunctionCallInsideObject() throws Exception { - runTest("testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt"); - } - - @TestMetadata("NestedObject.kt") - public void testNestedObject() throws Exception { - runTest("testData/quickfix/useFullyqualifiedCall/NestedObject.kt"); - } - - @TestMetadata("NestedObjectInRoot.kt") - public void testNestedObjectInRoot() throws Exception { - runTest("testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt"); - } - } - @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("testData/quickfix/variables") public abstract static class Variables extends AbstractK1QuickFixTest { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/use-site_invalid.kt b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/use-site_invalid.kt index 88621086688a..78a35dee705d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/use-site_invalid.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/use-site_invalid.kt @@ -3,6 +3,7 @@ // ACTION: Extract 'Test' from current file // ACTION: Make internal // ACTION: Make private +// ERROR: '@get:' annotations could be applied only to property declarations // ERROR: This annotation is not applicable to target 'class' and use site target '@get' annotation class Ann diff --git a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt deleted file mode 100644 index 97bcac522659..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt +++ /dev/null @@ -1,16 +0,0 @@ -// "Use fully qualified call" "true" - -package one.two.three - -object Test1 { - fun foo(x: Any) {} - fun foo(f: () -> Unit) {} - object Scope { - fun foo(r: Runnable) {} - - fun test(f: () -> Unit) { - foo(f) - } - } -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.UseFullyQualifiedCallFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt.after deleted file mode 100644 index 4ecfb11449c6..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/FunctionCallInsideObject.kt.after +++ /dev/null @@ -1,16 +0,0 @@ -// "Use fully qualified call" "true" - -package one.two.three - -object Test1 { - fun foo(x: Any) {} - fun foo(f: () -> Unit) {} - object Scope { - fun foo(r: Runnable) {} - - fun test(f: () -> Unit) { - Scope.foo(f) - } - } -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.UseFullyQualifiedCallFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObject.kt deleted file mode 100644 index f18672236283..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObject.kt +++ /dev/null @@ -1,18 +0,0 @@ -// "Use fully qualified call" "true" - -package one.two.three - -object Test1 { - fun foo(f: () -> T): T = f() - fun bar(): Int = 0 - - object Scope { - fun bar(x: Int = 0): String = "" - - fun test() { - val result = foo(::bar) - } - } -} - -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.UseFullyQualifiedCallFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObject.kt.after deleted file mode 100644 index 20ee97b366f5..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObject.kt.after +++ /dev/null @@ -1,18 +0,0 @@ -// "Use fully qualified call" "true" - -package one.two.three - -object Test1 { - fun foo(f: () -> T): T = f() - fun bar(): Int = 0 - - object Scope { - fun bar(x: Int = 0): String = "" - - fun test() { - val result = foo(Scope::bar) - } - } -} - -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.UseFullyQualifiedCallFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt b/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt deleted file mode 100644 index 8ee7c72529ed..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt +++ /dev/null @@ -1,16 +0,0 @@ -// "Use fully qualified call" "true" - -object Test1 { - fun foo(f: () -> T): T = f() - fun bar(): Int = 0 - - object Scope { - fun bar(x: Int = 0): String = "" - - fun test() { - val result = foo(::bar) - } - } -} - -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.UseFullyQualifiedCallFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt.after deleted file mode 100644 index 82e6cd243266..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/useFullyqualifiedCall/NestedObjectInRoot.kt.after +++ /dev/null @@ -1,16 +0,0 @@ -// "Use fully qualified call" "true" - -object Test1 { - fun foo(f: () -> T): T = f() - fun bar(): Int = 0 - - object Scope { - fun bar(x: Int = 0): String = "" - - fun test() { - val result = foo(Scope::bar) - } - } -} - -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.UseFullyQualifiedCallFix \ No newline at end of file