MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

quick fixes: MissingDependencyFixProvider code cleanup

Browse Source
This commit is contained in:
Vladislav.Soroka
2015-07-16 13:23:17 +03:00
parent 05669e880e
commit 3d4325af94
4 changed files with 64 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MissingDependencyFixUtil.java
+54
View File
@@ -0,0 +1,54 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.daemon.quickFix.MissingDependencyFixProvider;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.util.Function;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import static com.intellij.codeInsight.daemon.quickFix.MissingDependencyFixProvider.EP_NAME;
/**
* @author Vladislav.Soroka
* @since 7/16/2015
*/
public class MissingDependencyFixUtil {
@Nullable
public static List<LocalQuickFix> findFixes(Function<MissingDependencyFixProvider, List<LocalQuickFix>> provider) {
MissingDependencyFixProvider[] fixProviders = Extensions.getExtensions(EP_NAME);
for (MissingDependencyFixProvider each : fixProviders) {
List<LocalQuickFix> result = provider.fun(each);
if (result != null && !result.isEmpty()) return result;
}
return null;
}
@Nullable
public static <T> T provideFix(Function<MissingDependencyFixProvider, T> provider) {
MissingDependencyFixProvider[] fixProviders = Extensions.getExtensions(EP_NAME);
for (MissingDependencyFixProvider each : fixProviders) {
T result = provider.fun(each);
if (result != null && Boolean.FALSE != result) return result;
}
return null;
}
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java
+7 -5
View File
@@ -60,6 +60,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import static com.intellij.codeInsight.daemon.impl.quickfix.MissingDependencyFixUtil.*;
/**
* @author cdr
*/
@@ -101,7 +103,7 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
final Module currentModule = fileIndex.getModuleForFile(classVFile);
if (currentModule == null) return null;
final List<LocalQuickFix> providedFixes = MissingDependencyFixProvider.findFixes(new Function<MissingDependencyFixProvider, List<LocalQuickFix>>() {
final List<LocalQuickFix> providedFixes = findFixes(new Function<MissingDependencyFixProvider, List<LocalQuickFix>>() {
@Override
public List<LocalQuickFix> fun(MissingDependencyFixProvider provider) {
return provider.registerFixes(registrar, reference);
@@ -154,7 +156,7 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
}
};
final OrderEntryFix providedFix = MissingDependencyFixProvider.find(new Function<MissingDependencyFixProvider, OrderEntryFix>() {
final OrderEntryFix providedFix = provideFix(new Function<MissingDependencyFixProvider, OrderEntryFix>() {
@Override
public OrderEntryFix fun(MissingDependencyFixProvider provider) {
return provider.getJetbrainsAnnotationFix(reference, platformFix, currentModule);
@@ -179,7 +181,7 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
final PsiClass[] finalClasses = classes;
final OrderEntryFix finalModuleDependencyFix = moduleDependencyFix;
final OrderEntryFix providedModuleDependencyFix = MissingDependencyFixProvider.find(new Function<MissingDependencyFixProvider, OrderEntryFix>() {
final OrderEntryFix providedModuleDependencyFix = provideFix(new Function<MissingDependencyFixProvider, OrderEntryFix>() {
@Override
public OrderEntryFix fun(MissingDependencyFixProvider provider) {
return provider.getAddModuleDependencyFix(reference, finalModuleDependencyFix, currentModule, classVFile, finalClasses);
@@ -245,7 +247,7 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
}
};
final OrderEntryFix providedFix = MissingDependencyFixProvider.find(new Function<MissingDependencyFixProvider, OrderEntryFix>() {
final OrderEntryFix providedFix = provideFix(new Function<MissingDependencyFixProvider, OrderEntryFix>() {
@Override
public OrderEntryFix fun(MissingDependencyFixProvider provider) {
return provider.getAddLibraryToClasspathFix(reference, platformFix, currentModule, libraryEntry, aClass);
@@ -322,7 +324,7 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
public static void addJarsToRoots(@NotNull final List<String> jarPaths, @Nullable final String libraryName,
@NotNull final Module module, @Nullable final PsiElement location) {
final Boolean isAdded = MissingDependencyFixProvider.find(new Function<MissingDependencyFixProvider, Boolean>() {
final Boolean isAdded = provideFix(new Function<MissingDependencyFixProvider, Boolean>() {
@Override
public Boolean fun(MissingDependencyFixProvider provider) {
return provider.addJarsToRoots(jarPaths, libraryName, module, location);
java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/MissingDependencyFixProvider.java
+1 -23
View File
@@ -43,31 +43,9 @@ import java.util.List;
* @since 7/15/2015
*/
public abstract class MissingDependencyFixProvider {
private static final ExtensionPointName<MissingDependencyFixProvider> EP_NAME =
public static final ExtensionPointName<MissingDependencyFixProvider> EP_NAME =
ExtensionPointName.create("com.intellij.codeInsight.missingDependencyFixProvider");
@Nullable
public static List<LocalQuickFix> findFixes(Function<MissingDependencyFixProvider, List<LocalQuickFix>> provider) {
MissingDependencyFixProvider[] fixProviders = Extensions.getExtensions(EP_NAME);
for (MissingDependencyFixProvider each : fixProviders) {
List<LocalQuickFix> result = provider.fun(each);
if (result != null && !result.isEmpty()) return result;
}
return null;
}
@Nullable
public static <T> T find(Function<MissingDependencyFixProvider, T> provider) {
MissingDependencyFixProvider[] fixProviders = Extensions.getExtensions(EP_NAME);
for (MissingDependencyFixProvider each : fixProviders) {
T result = provider.fun(each);
if (result != null && Boolean.FALSE != result) return result;
}
return null;
}
@Nullable
public List<LocalQuickFix> registerFixes(@NotNull QuickFixActionRegistrar registrar, @NotNull final PsiReference reference) {
return null;
plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnitUnresolvedReferenceQuickFixProvider.java
+2 -1
View File
@@ -17,6 +17,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.MissingDependencyFixUtil;
import com.intellij.codeInsight.daemon.impl.quickfix.OrderEntryFix;
import com.intellij.codeInsight.daemon.quickFix.MissingDependencyFixProvider;
import com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider;
@@ -103,7 +104,7 @@ public class JUnitUnresolvedReferenceQuickFixProvider extends UnresolvedReferenc
}
};
final OrderEntryFix providedFix = MissingDependencyFixProvider.find(new Function<MissingDependencyFixProvider, OrderEntryFix>() {
final OrderEntryFix providedFix = MissingDependencyFixUtil.provideFix(new Function<MissingDependencyFixProvider, OrderEntryFix>() {
@Override
public OrderEntryFix fun(MissingDependencyFixProvider provider) {
return provider.getJUnitFix(reference, platformFix, currentModule, framework, className);