From 94249cf315a1595a08df2b821a3d268d18254751 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Mon, 28 Oct 2024 12:14:50 +0100 Subject: [PATCH] KTIJ-31336 [kotlin] Reproduce redundant `kotlin.Throws` import added in K2 Mode (cherry picked from commit ab0429cf74585b5d4d08f424e53af387dfe19b15) IJ-CR-149236 GitOrigin-RevId: b0c952307a2951dedbbe7c34dacde37d774383b1 --- .../fir/imports/FirJvmOptimizeImportsTestGenerated.java | 5 +++++ .../idea/imports/JvmOptimizeImportsTestGenerated.java | 5 +++++ .../jvm/allUnderImports/NoRedundantThrowsImport.kt | 8 ++++++++ .../jvm/allUnderImports/NoRedundantThrowsImport.kt.after | 8 ++++++++ 4 files changed, 26 insertions(+) create mode 100644 plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt create mode 100644 plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt.after diff --git a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java index f719dd8fd1c5..ea44540f716e 100644 --- a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java +++ b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java @@ -130,6 +130,11 @@ public abstract class FirJvmOptimizeImportsTestGenerated extends AbstractFirJvmO runTest("../../idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NestedStaticMembersFromJavaAreConsideredMembers.kt"); } + @TestMetadata("NoRedundantThrowsImport.kt") + public void testNoRedundantThrowsImport() throws Exception { + runTest("../../idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt"); + } + @TestMetadata("PackagesToUseStarImport.kt") public void testPackagesToUseStarImport() throws Exception { runTest("../../idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt"); diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java index 41aa9cf749a7..f080a8d50ec3 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/imports/JvmOptimizeImportsTestGenerated.java @@ -130,6 +130,11 @@ public abstract class JvmOptimizeImportsTestGenerated extends AbstractJvmOptimiz runTest("testData/editor/optimizeImports/jvm/allUnderImports/NestedStaticMembersFromJavaAreConsideredMembers.kt"); } + @TestMetadata("NoRedundantThrowsImport.kt") + public void testNoRedundantThrowsImport() throws Exception { + runTest("testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt"); + } + @TestMetadata("PackagesToUseStarImport.kt") public void testPackagesToUseStarImport() throws Exception { runTest("testData/editor/optimizeImports/jvm/allUnderImports/PackagesToUseStarImport.kt"); diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt new file mode 100644 index 000000000000..ed111227b3c7 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt @@ -0,0 +1,8 @@ +// NAME_COUNT_TO_USE_STAR_IMPORT: 2 +// IGNORE_K2 +package test + +@Throws +fun test( + extraParam: String // to have a reference from kotlin.* package +) {} diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt.after new file mode 100644 index 000000000000..ed111227b3c7 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/allUnderImports/NoRedundantThrowsImport.kt.after @@ -0,0 +1,8 @@ +// NAME_COUNT_TO_USE_STAR_IMPORT: 2 +// IGNORE_K2 +package test + +@Throws +fun test( + extraParam: String // to have a reference from kotlin.* package +) {}