From 8fad23691f212a7070ec344769c4622254362477 Mon Sep 17 00:00:00 2001 From: Wojciech Lopata Date: Thu, 14 Feb 2013 13:54:32 +0100 Subject: [PATCH] QuickFix for USELESS_HIDDEN_IMPORT. --- idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java | 4 +++- .../uselessImports/afterRemoveUselessHiddenImport.kt | 4 ++++ .../uselessImports/beforeRemoveUselessHiddenImport.kt | 5 +++++ .../jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 idea/testData/quickfix/uselessImports/afterRemoveUselessHiddenImport.kt create mode 100644 idea/testData/quickfix/uselessImports/beforeRemoveUselessHiddenImport.kt diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java index 451b1b85285..02569997685 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java @@ -125,7 +125,9 @@ public class QuickFixes { JetIntentionActionFactory unresolvedReferenceFactory = ImportClassAndFunFix.createFactory(); factories.put(UNRESOLVED_REFERENCE, unresolvedReferenceFactory); - factories.put(USELESS_SIMPLE_IMPORT, RemoveImportFix.createFactory()); + JetIntentionActionFactory removeImportFixFactory = RemoveImportFix.createFactory(); + factories.put(USELESS_SIMPLE_IMPORT, removeImportFixFactory); + factories.put(USELESS_HIDDEN_IMPORT, removeImportFixFactory); factories.put(SUPERTYPE_NOT_INITIALIZED_DEFAULT, ChangeToConstructorInvocationFix.createFactory()); factories.put(FUNCTION_CALL_EXPECTED, ChangeToFunctionInvocationFix.createFactory()); diff --git a/idea/testData/quickfix/uselessImports/afterRemoveUselessHiddenImport.kt b/idea/testData/quickfix/uselessImports/afterRemoveUselessHiddenImport.kt new file mode 100644 index 00000000000..0ebc2b4e82c --- /dev/null +++ b/idea/testData/quickfix/uselessImports/afterRemoveUselessHiddenImport.kt @@ -0,0 +1,4 @@ +// "Remove useless import for 'jet.List'" "true" +import jet.Double + +class List {} diff --git a/idea/testData/quickfix/uselessImports/beforeRemoveUselessHiddenImport.kt b/idea/testData/quickfix/uselessImports/beforeRemoveUselessHiddenImport.kt new file mode 100644 index 00000000000..8b2b9dc839d --- /dev/null +++ b/idea/testData/quickfix/uselessImports/beforeRemoveUselessHiddenImport.kt @@ -0,0 +1,5 @@ +// "Remove useless import for 'jet.List'" "true" +import jet.Double +import jet.List + +class List {} diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java index 3a5cf8ebe1d..fb00222b6a3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java @@ -726,6 +726,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/uselessImports"), Pattern.compile("^before(\\w+)\\.kt$"), true); } + @TestMetadata("beforeRemoveUselessHiddenImport.kt") + public void testRemoveUselessHiddenImport() throws Exception { + doTest("idea/testData/quickfix/uselessImports/beforeRemoveUselessHiddenImport.kt"); + } + @TestMetadata("beforeRemoveUselessImport.kt") public void testRemoveUselessImport() throws Exception { doTest("idea/testData/quickfix/uselessImports/beforeRemoveUselessImport.kt");