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

choose quick fix by class equivalence first to avoid wrong fix to be performed based on fixes hierarchy (IDEA-137069)

Browse Source 
(cherry picked from commit 7b37b03fa75bfc09c72a45d693fccc5fbf8f6e38)
This commit is contained in:
Anna Kozlova
2015-03-11 20:30:50 +01:00
parent 4cd0389945
commit f8cfe755df
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInspection/ex/LocalQuickFixWrapper.java
+16 -4
View File
@@ -24,9 +24,12 @@ import com.intellij.codeInspection.reference.RefManager;
import com.intellij.codeInspection.ui.InspectionToolPresentation;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.PairFunction;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -76,17 +79,26 @@ public class LocalQuickFixWrapper extends QuickFixAction {
@Nullable
protected QuickFix getWorkingQuickFix(@NotNull QuickFix[] fixes) {
final QuickFix exactResult = getWorkingQuickFix(fixes, true);
return exactResult != null ? exactResult : getWorkingQuickFix(fixes, false);
}
@Nullable
protected QuickFix getWorkingQuickFix(@NotNull QuickFix[] fixes, boolean exact) {
for (QuickFix fix : fixes) {
if (!myFix.getClass().isInstance(fix)) continue;
if (myFix instanceof IntentionWrapper && fix instanceof IntentionWrapper &&
!((IntentionWrapper)myFix).getAction().getClass().isInstance(((IntentionWrapper)fix).getAction())) {
continue;
if (!checkFix(exact, myFix, fix)) continue;
if (myFix instanceof IntentionWrapper && fix instanceof IntentionWrapper) {
if (!checkFix(exact, ((IntentionWrapper)myFix).getAction(), fix)) continue;
}
return fix;
}
return null;
}
private static <T> boolean checkFix(boolean exact, T thisFix, T fix) {
return exact ? thisFix.getClass() == fix.getClass() : thisFix.getClass().isInstance(fix);
}
@Override
protected boolean applyFix(@NotNull RefEntity[] refElements) {
return true;