From cc9cad7d69a02700543787c958e61fbc8f784a21 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 21 Mar 2012 18:26:42 +0100 Subject: [PATCH] do not create fix in batch mode if it requires dialog (IDEA-83242) --- .../accessStaticViaInstance/AccessStaticViaInstance.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/java/java-impl/src/com/intellij/codeInspection/accessStaticViaInstance/AccessStaticViaInstance.java b/java/java-impl/src/com/intellij/codeInspection/accessStaticViaInstance/AccessStaticViaInstance.java index fab03cbb389b..5ae5d0c47e1a 100644 --- a/java/java-impl/src/com/intellij/codeInspection/accessStaticViaInstance/AccessStaticViaInstance.java +++ b/java/java-impl/src/com/intellij/codeInspection/accessStaticViaInstance/AccessStaticViaInstance.java @@ -19,6 +19,7 @@ import com.intellij.codeInsight.daemon.JavaErrorMessages; import com.intellij.codeInsight.daemon.impl.analysis.HighlightMessageUtil; import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil; import com.intellij.codeInsight.daemon.impl.quickfix.AccessStaticViaInstanceFix; +import com.intellij.codeInsight.daemon.impl.quickfix.RemoveUnusedVariableFix; import com.intellij.codeInspection.BaseJavaLocalInspectionTool; import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemsHolder; @@ -26,6 +27,8 @@ import com.intellij.psi.*; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; + /** * User: anna * Date: 15-Nov-2005 @@ -87,6 +90,12 @@ public class AccessStaticViaInstance extends BaseJavaLocalInspectionTool { String description = JavaErrorMessages.message("static.member.accessed.via.instance.reference", HighlightUtil.formatType(qualifierExpression.getType()), HighlightMessageUtil.getSymbolName(resolved, result.getSubstitutor())); + if (!onTheFly) { + if (RemoveUnusedVariableFix.checkSideEffects(qualifierExpression, null, new ArrayList())) { + holder.registerProblem(expr, description); + return; + } + } holder.registerProblem(expr, description, new AccessStaticViaInstanceFix(expr, result, onTheFly)); } }