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

change signature: follow signature changes after conflicts (IDEA-264699)

Browse Source 
GitOrigin-RevId: e5367d1478464b0f4cfce441f2edfa456f4159dc
This commit is contained in:
Anna Kozlova
2021-03-22 13:20:52 +00:00
committed by intellij-monorepo-bot
parent ee26daf130
commit 6dfd55de7c
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
-5
View File
@@ -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());
}