From 6dfd55de7c6964c2d734ab9457379d4aa1969237 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 22 Mar 2021 13:13:07 +0100
Subject: [PATCH] change signature: follow signature changes after conflicts
 (IDEA-264699)

GitOrigin-RevId: e5367d1478464b0f4cfce441f2edfa456f4159dc
---
 .../changeSignature/ChangeSignatureDialogBase.java           | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
index f1c55debf594..54451c102971 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
@@ -91,7 +91,6 @@ public abstract class ChangeSignatureDialogBase<ParamInfo extends ParameterInfo,
   private DelegationPanel myDelegationPanel;
   protected AnActionButton myPropagateParamChangesButton;
   protected Set<Method> myMethodsToPropagateParameters = null;
-  private boolean myDisposed;
 
   private Tree myParameterPropagationTreeToReuse;
 
@@ -133,7 +132,6 @@ public abstract class ChangeSignatureDialogBase<ParamInfo extends ParameterInfo,
       @Override
       public void dispose() {
         myUpdateSignatureAlarm.cancelAllRequests();
-        myDisposed = true;
       }
     });
   }
@@ -588,12 +586,10 @@ public abstract class ChangeSignatureDialogBase<ParamInfo extends ParameterInfo,
     if (mySignatureArea == null || myPropagateParamChangesButton == null) return;
 
     final Runnable updateRunnable = () -> {
-      if (myDisposed) return;
       myUpdateSignatureAlarm.cancelAllRequests();
       myUpdateSignatureAlarm.addRequest(() ->
         PsiDocumentManager.getInstance(myProject).performLaterWhenAllCommitted(() -> updateSignatureAlarmFired()), 100, ModalityState.stateForComponent(mySignatureArea));
     };
-    //noinspection SSBasedInspection
     SwingUtilities.invokeLater(updateRunnable);
   }
 
@@ -640,7 +636,6 @@ public abstract class ChangeSignatureDialogBase<ParamInfo extends ParameterInfo,
       myMethodsToPropagateParameters = null;
     }
 
-    myDisposed = true;
     invokeRefactoring(createRefactoringProcessor());
   }