From 835d90a75b5359bb752e9e9e812dfeeda15a3aad Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 16 Jul 2015 12:16:53 +0300 Subject: [PATCH] quick fixes: extension point for order entry quick fixes renamed to MissingDependencyFixProvider --- .../daemon/impl/quickfix/OrderEntryFix.java | 21 +++++++++-------- .../MissingDependencyFixProvider.java} | 23 ++++++++++--------- .../src/META-INF/LangExtensionPoints.xml | 4 ++-- ...itUnresolvedReferenceQuickFixProvider.java | 6 ++--- 4 files changed, 28 insertions(+), 26 deletions(-) rename java/java-impl/src/com/intellij/codeInsight/daemon/{impl/quickfix/OrderEntryFixProvider.java => quickFix/MissingDependencyFixProvider.java} (79%) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java index c9caf4bb5e43..251ecf3d3db8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java @@ -19,6 +19,7 @@ import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.daemon.QuickFixActionRegistrar; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.actions.AddImportAction; +import com.intellij.codeInsight.daemon.quickFix.MissingDependencyFixProvider; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; @@ -100,9 +101,9 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix { final Module currentModule = fileIndex.getModuleForFile(classVFile); if (currentModule == null) return null; - final List providedFixes = OrderEntryFixProvider.findFixes(new Function>() { + final List providedFixes = MissingDependencyFixProvider.findFixes(new Function>() { @Override - public List fun(OrderEntryFixProvider provider) { + public List fun(MissingDependencyFixProvider provider) { return provider.registerFixes(registrar, reference); } }); @@ -153,9 +154,9 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix { } }; - final OrderEntryFix providedFix = OrderEntryFixProvider.find(new Function() { + final OrderEntryFix providedFix = MissingDependencyFixProvider.find(new Function() { @Override - public OrderEntryFix fun(OrderEntryFixProvider provider) { + public OrderEntryFix fun(MissingDependencyFixProvider provider) { return provider.getJetbrainsAnnotationFix(reference, platformFix, currentModule); } }); @@ -178,9 +179,9 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix { final PsiClass[] finalClasses = classes; final OrderEntryFix finalModuleDependencyFix = moduleDependencyFix; - final OrderEntryFix providedModuleDependencyFix = OrderEntryFixProvider.find(new Function() { + final OrderEntryFix providedModuleDependencyFix = MissingDependencyFixProvider.find(new Function() { @Override - public OrderEntryFix fun(OrderEntryFixProvider provider) { + public OrderEntryFix fun(MissingDependencyFixProvider provider) { return provider.getAddModuleDependencyFix(reference, finalModuleDependencyFix, currentModule, classVFile, finalClasses); } }); @@ -244,9 +245,9 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix { } }; - final OrderEntryFix providedFix = OrderEntryFixProvider.find(new Function() { + final OrderEntryFix providedFix = MissingDependencyFixProvider.find(new Function() { @Override - public OrderEntryFix fun(OrderEntryFixProvider provider) { + public OrderEntryFix fun(MissingDependencyFixProvider provider) { return provider.getAddLibraryToClasspathFix(reference, platformFix, currentModule, libraryEntry, aClass); } }); @@ -321,9 +322,9 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix { public static void addJarsToRoots(@NotNull final List jarPaths, @Nullable final String libraryName, @NotNull final Module module, @Nullable final PsiElement location) { - final Boolean isAdded = OrderEntryFixProvider.find(new Function() { + final Boolean isAdded = MissingDependencyFixProvider.find(new Function() { @Override - public Boolean fun(OrderEntryFixProvider provider) { + public Boolean fun(MissingDependencyFixProvider provider) { return provider.addJarsToRoots(jarPaths, libraryName, module, location); } }); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFixProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/MissingDependencyFixProvider.java similarity index 79% rename from java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFixProvider.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/MissingDependencyFixProvider.java index 1c2face6a7d1..bca6087a5a9b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFixProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/MissingDependencyFixProvider.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.codeInsight.daemon.impl.quickfix; +package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInsight.daemon.QuickFixActionRegistrar; +import com.intellij.codeInsight.daemon.impl.quickfix.OrderEntryFix; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; @@ -33,7 +34,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; /** - * {@link OrderEntryFixProvider} extension can be used to override or complement default platform {@link OrderEntryFix}-es. + * {@link MissingDependencyFixProvider} extension can be used to override or complement default platform {@link OrderEntryFix}-es. *

* It can be useful for modules imported from external build system like Maven, Gradle etc, * when external build configuration(pom.xml/*.gradle scripts) should be changed in additional or instead of IntelliJ project configuration. @@ -41,14 +42,14 @@ import java.util.List; * @author Vladislav.Soroka * @since 7/15/2015 */ -public abstract class OrderEntryFixProvider { - private static final ExtensionPointName EP_NAME = - ExtensionPointName.create("com.intellij.codeInsight.orderEntryFixProvider"); +public abstract class MissingDependencyFixProvider { + private static final ExtensionPointName EP_NAME = + ExtensionPointName.create("com.intellij.codeInsight.missingDependencyFixProvider"); @Nullable - public static List findFixes(Function> provider) { - OrderEntryFixProvider[] fixProviders = Extensions.getExtensions(EP_NAME); - for (OrderEntryFixProvider each : fixProviders) { + public static List findFixes(Function> provider) { + MissingDependencyFixProvider[] fixProviders = Extensions.getExtensions(EP_NAME); + for (MissingDependencyFixProvider each : fixProviders) { List result = provider.fun(each); if (result != null && !result.isEmpty()) return result; } @@ -57,9 +58,9 @@ public abstract class OrderEntryFixProvider { } @Nullable - public static T find(Function provider) { - OrderEntryFixProvider[] fixProviders = Extensions.getExtensions(EP_NAME); - for (OrderEntryFixProvider each : fixProviders) { + public static T find(Function provider) { + MissingDependencyFixProvider[] fixProviders = Extensions.getExtensions(EP_NAME); + for (MissingDependencyFixProvider each : fixProviders) { T result = provider.fun(each); if (result != null && Boolean.FALSE != result) return result; } diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml index bba07d47fb02..6d8b5739da07 100644 --- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml @@ -52,8 +52,8 @@ - + diff --git a/plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnitUnresolvedReferenceQuickFixProvider.java b/plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnitUnresolvedReferenceQuickFixProvider.java index a6ba6f0da00a..fe8f1da43f64 100644 --- a/plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnitUnresolvedReferenceQuickFixProvider.java +++ b/plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnitUnresolvedReferenceQuickFixProvider.java @@ -18,7 +18,7 @@ package com.intellij.execution.junit.codeInsight; import com.intellij.codeInsight.daemon.QuickFixActionRegistrar; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.quickfix.OrderEntryFix; -import com.intellij.codeInsight.daemon.impl.quickfix.OrderEntryFixProvider; +import com.intellij.codeInsight.daemon.quickFix.MissingDependencyFixProvider; import com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider; import com.intellij.execution.junit.JUnit3Framework; import com.intellij.execution.junit.JUnit4Framework; @@ -103,9 +103,9 @@ public class JUnitUnresolvedReferenceQuickFixProvider extends UnresolvedReferenc } }; - final OrderEntryFix providedFix = OrderEntryFixProvider.find(new Function() { + final OrderEntryFix providedFix = MissingDependencyFixProvider.find(new Function() { @Override - public OrderEntryFix fun(OrderEntryFixProvider provider) { + public OrderEntryFix fun(MissingDependencyFixProvider provider) { return provider.getJUnitFix(reference, platformFix, currentModule, framework, className); } });