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

git-index: disable modifications actions if they do nothing

Browse Source 
GitOrigin-RevId: 38e1b9a11de0aa939f1afb93fef92b9b397c0847
This commit is contained in:
Aleksey Pivovarov
2020-09-28 14:59:28 +00:00
committed by intellij-monorepo-bot
parent 9e06661f6d
commit d2ee7c50e2
2 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java
+39 -16
View File
@@ -264,22 +264,6 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx {
return DiffUtil.isEditable(getEditor(side));
}
protected boolean isSomeChangeSelected(@NotNull ThreeSide side) {
if (getChanges().isEmpty()) return false;
EditorEx editor = getEditor(side);
return DiffUtil.isSomeRangeSelected(editor, lines ->
ContainerUtil.exists(getChanges(), change -> isChangeSelected(change, lines, side)));
}
@NotNull
@RequiresEdt
private List<SimpleThreesideDiffChange> getSelectedChanges(@NotNull ThreeSide side) {
EditorEx editor = getEditor(side);
BitSet lines = DiffUtil.getSelectedLines(editor);
return ContainerUtil.filter(getChanges(), change -> isChangeSelected(change, lines, side));
}
//
// Modification operations
//
@@ -294,6 +278,9 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx {
myDiffChanges.remove(change);
myInvalidDiffChanges.add(change);
change.markInvalid();
// Do not rely on DocumentListener in case of identical change
scheduleRediff();
}
//
@@ -330,6 +317,17 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx {
return !isBothEditable() || side == mySourceSide;
}
@Override
protected boolean isEnabled(@NotNull ThreesideDiffChangeBase change) {
Side side1 = myModifiedSide.select(Side.LEFT, null, Side.RIGHT);
if (side1 != null && change.isChange(side1)) return true;
Side side2 = mySourceSide.select(Side.LEFT, null, Side.RIGHT);
if (side2 != null && change.isChange(side2)) return true;
return false;
}
protected boolean isBothEditable() {
return isEditable(mySourceSide) && isEditable(myModifiedSide);
}
@@ -398,6 +396,8 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx {
protected abstract boolean isVisible(@NotNull ThreeSide side);
protected abstract boolean isEnabled(@NotNull ThreesideDiffChangeBase change);
@Nls
@NotNull
protected abstract String getText(@NotNull ThreeSide side);
@@ -407,6 +407,29 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx {
@RequiresWriteLock
protected abstract void doPerform(@NotNull AnActionEvent e, @NotNull ThreeSide side, @NotNull List<SimpleThreesideDiffChange> changes);
private boolean isSomeChangeSelected(@NotNull ThreeSide side) {
if (getChanges().isEmpty()) return false;
EditorEx editor = getEditor(side);
return DiffUtil.isSomeRangeSelected(editor, lines ->
ContainerUtil.exists(getChanges(), change -> isChangeSelected(change, lines, side)));
}
@NotNull
@RequiresEdt
private List<SimpleThreesideDiffChange> getSelectedChanges(@NotNull ThreeSide side) {
EditorEx editor = getEditor(side);
BitSet lines = DiffUtil.getSelectedLines(editor);
return ContainerUtil.filter(getChanges(), change -> isChangeSelected(change, lines, side));
}
private boolean isChangeSelected(@NotNull ThreesideDiffChangeBase change, @NotNull BitSet lines, @NotNull ThreeSide side) {
if (!isEnabled(change)) return false;
int line1 = change.getStartLine(side);
int line2 = change.getEndLine(side);
return DiffUtil.isSelectedByLine(lines, line1, line2);
}
}
//
platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java
-6
View File
@@ -246,12 +246,6 @@ public abstract class ThreesideTextDiffViewerEx extends ThreesideTextDiffViewer
return null;
}
protected static boolean isChangeSelected(@NotNull ThreesideDiffChangeBase change, @NotNull BitSet lines, @NotNull ThreeSide side) {
int line1 = change.getStartLine(side);
int line2 = change.getEndLine(side);
return DiffUtil.isSelectedByLine(lines, line1, line2);
}
//
// Actions
//