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

merge: rename method

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-10-18 13:58:48 +03:00
parent 727477d048
commit 321315e9f0
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java
+2 -2
View File
@@ -324,11 +324,11 @@ public class TextMergeChange extends ThreesideDiffChangeBase {
@Nullable
private GutterIconRenderer createResolveRenderer() {
if (!this.isConflict() || !myViewer.canApplyNonConflictedChange(this, ThreeSide.BASE)) return null;
if (!this.isConflict() || !myViewer.canResolveChangeAutomatically(this, ThreeSide.BASE)) return null;
return createIconRenderer(DiffBundle.message("merge.dialog.resolve.change.action.name"), AllIcons.Diff.MagicResolve, false, () -> {
myViewer.executeMergeCommand("Resolve conflict", Collections.singletonList(this), () -> {
myViewer.applyNonConflictedChange(this, ThreeSide.BASE);
myViewer.resolveChangeAutomatically(this, ThreeSide.BASE);
});
});
}
platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
+7 -7
View File
@@ -829,14 +829,14 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
//
private boolean hasNonConflictedChanges(@NotNull ThreeSide side) {
return ContainerUtil.exists(getAllChanges(), change -> canApplyNonConflictedChange(change, side));
return ContainerUtil.exists(getAllChanges(), change -> canResolveChangeAutomatically(change, side));
}
private void applyNonConflictedChanges(@NotNull ThreeSide side) {
executeMergeCommand("Apply Non Conflicted Changes", true, null, () -> {
List<TextMergeChange> allChanges = ContainerUtil.newArrayList(getAllChanges());
for (TextMergeChange change : allChanges) {
applyNonConflictedChange(change, side);
resolveChangeAutomatically(change, side);
}
});
@@ -844,7 +844,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
if (firstUnresolved != null) doScrollToChange(firstUnresolved, true);
}
public boolean canApplyNonConflictedChange(@NotNull TextMergeChange change, @NotNull ThreeSide side) {
public boolean canResolveChangeAutomatically(@NotNull TextMergeChange change, @NotNull ThreeSide side) {
if (change.isConflict()) {
return side == ThreeSide.BASE &&
change.getType().canBeResolved() &&
@@ -874,8 +874,8 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
return !StringUtil.equals(baseContent, resultContent);
}
public void applyNonConflictedChange(@NotNull TextMergeChange change, @NotNull ThreeSide side) {
if (!canApplyNonConflictedChange(change, side)) return;
public void resolveChangeAutomatically(@NotNull TextMergeChange change, @NotNull ThreeSide side) {
if (!canResolveChangeAutomatically(change, side)) return;
if (change.isConflict()) {
List<CharSequence> texts = ThreeSide.map(it -> {
@@ -1144,14 +1144,14 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
@Override
protected boolean isEnabled(@NotNull TextMergeChange change) {
return canApplyNonConflictedChange(change, ThreeSide.BASE);
return canResolveChangeAutomatically(change, ThreeSide.BASE);
}
@Override
protected void apply(@NotNull ThreeSide side, @NotNull List<TextMergeChange> changes) {
for (int i = changes.size() - 1; i >= 0; i--) {
TextMergeChange change = changes.get(i);
applyNonConflictedChange(change, ThreeSide.BASE);
resolveChangeAutomatically(change, ThreeSide.BASE);
}
}
}
platform/diff-impl/tests/com/intellij/diff/merge/MergeAutoTest.kt
+1 -1
View File
@@ -82,7 +82,7 @@ class MergeAutoTest : MergeTestBase() {
val index = RNG.nextInt(changes.size)
val change = changes[index]
command(change) { viewer.applyNonConflictedChange(change, ThreeSide.BASE) }
command(change) { viewer.resolveChangeAutomatically(change, ThreeSide.BASE) }
}
private fun TestBuilder.doModifyText(): Unit {
platform/diff-impl/tests/com/intellij/diff/merge/MergeTestBase.kt
+3 -3
View File
@@ -146,14 +146,14 @@ abstract class MergeTestBase : HeavyDiffTestCase() {
fun Int.resolve() {
val change = change(this)
command(change) {
assertTrue(change.isConflict && viewer.canApplyNonConflictedChange(change, ThreeSide.BASE))
viewer.applyNonConflictedChange(change, ThreeSide.BASE)
assertTrue(change.isConflict && viewer.canResolveChangeAutomatically(change, ThreeSide.BASE))
viewer.resolveChangeAutomatically(change, ThreeSide.BASE)
}
}
fun Int.canResolveConflict(): Boolean {
val change = change(this)
return viewer.canApplyNonConflictedChange(change, ThreeSide.BASE)
return viewer.canResolveChangeAutomatically(change, ThreeSide.BASE)
}
//