From 9f7f48cb3ba64058d418cd1f4ac3dd84c48d9dae Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Mon, 7 Nov 2016 12:16:17 +0300
Subject: [PATCH] unused return value inspection: do not cache quick fix
 (otherwise it doesn't work after inspection re-run)

---
 .../unusedReturnValue/UnusedReturnValue.java        | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
index f295d2361d9c..5ba6ec614705 100644
--- a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
+++ b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
@@ -42,8 +42,6 @@ import java.util.List;
  * @author max
  */
 public class UnusedReturnValue extends GlobalJavaBatchInspectionTool{
-  private MakeVoidQuickFix myQuickFix;
-
   public boolean IGNORE_BUILDER_PATTERN;
 
   @Override
@@ -69,7 +67,7 @@ public class UnusedReturnValue extends GlobalJavaBatchInspectionTool{
         return new ProblemDescriptor[]{manager.createProblemDescriptor(psiMethod.getNavigationElement(),
                                                                        InspectionsBundle
                                                                          .message("inspection.unused.return.value.problem.descriptor"),
-                                                                       !isNative ? getFix(processor) : null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+                                                                       !isNative ? new MakeVoidQuickFix(processor) : null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                                                                        false)};
       }
     }
@@ -131,17 +129,10 @@ public class UnusedReturnValue extends GlobalJavaBatchInspectionTool{
     return "UnusedReturnValue";
   }
 
-  private LocalQuickFix getFix(final ProblemDescriptionsProcessor processor) {
-    if (myQuickFix == null) {
-      myQuickFix = new MakeVoidQuickFix(processor);
-    }
-    return myQuickFix;
-  }
-
   @Override
   @Nullable
   public QuickFix getQuickFix(String hint) {
-    return getFix(null);
+    return new MakeVoidQuickFix(null);
   }
 
   private static class MakeVoidQuickFix implements LocalQuickFix {