MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-156230 merge: disable resolve button on performing external resolving

Browse Source 
GitOrigin-RevId: bd9a0ec4f4718f15d5b6f6fe48e43a07cbb52635
This commit is contained in:
Aleksandr Krasilnikov
2024-06-04 11:43:47 +02:00
committed by intellij-monorepo-bot
parent 4d94093336
commit 28aa440bce
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/diff-impl/src/com/intellij/diff/merge/MergeThreesideViewer.java
View File

@@ -1164,6 +1164,7 @@ public class MergeThreesideViewer extends ThreesideTextDiffViewerEx {
@RequiresEdt
private void runBeforeExternalOperation() {
myMergeContext.putUserData(EXTERNAL_OPERATION_IN_PROGRESS, true);
enableResolveActions(false);
getEditor().setViewer(true);
for (TextMergeChange change : getAllChanges()) {
@@ -1174,6 +1175,7 @@ public class MergeThreesideViewer extends ThreesideTextDiffViewerEx {
@RequiresEdt
private void runAfterExternalOperation() {
myMergeContext.putUserData(EXTERNAL_OPERATION_IN_PROGRESS, null);
enableResolveActions(true);
getEditor().setViewer(false);
for (TextMergeChange change : getAllChanges()) {
@@ -1181,6 +1183,12 @@ public class MergeThreesideViewer extends ThreesideTextDiffViewerEx {
}
}
private void enableResolveActions(boolean enable) {
myLeftResolveAction.setEnabled(enable);
myRightResolveAction.setEnabled(enable);
myAcceptResolveAction.setEnabled(enable);
}
private abstract class ApplySelectedChangesActionBase extends AnAction implements DumbAware {
@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {