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

patch: apply somehow - avoid unnecessary scrolling

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-04-26 14:57:26 +03:00
committed by Aleksey Pivovarov
parent 1969592f05
commit f6f7db0bcf
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/util/SyncScrollSupport.java
+9 -6
View File
@@ -242,7 +242,7 @@ public class SyncScrollSupport {
assert startLines.length == count;
assert endLines.length == count;
final int[] offsets = getTargetOffsets(editors.toArray(new Editor[count]), startLines, endLines);
final int[] offsets = getTargetOffsets(editors.toArray(new Editor[count]), startLines, endLines, -1);
final int[] startOffsets = new int[count];
for (int i = 0; i < count; i++) {
@@ -412,14 +412,16 @@ public class SyncScrollSupport {
@NotNull
public static int[] getTargetOffsets(@NotNull Editor editor1, @NotNull Editor editor2,
int startLine1, int endLine1, int startLine2, int endLine2) {
int startLine1, int endLine1, int startLine2, int endLine2,
int preferredTopShift) {
return getTargetOffsets(new Editor[]{editor1, editor2},
new int[]{startLine1, startLine2},
new int[]{endLine1, endLine2});
new int[]{endLine1, endLine2},
preferredTopShift);
}
@NotNull
private static int[] getTargetOffsets(@NotNull Editor[] editors, int[] startLines, int[] endLines) {
private static int[] getTargetOffsets(@NotNull Editor[] editors, int[] startLines, int[] endLines, int preferredTopShift) {
int count = editors.length;
assert startLines.length == count;
assert endLines.length == count;
@@ -444,11 +446,12 @@ public class SyncScrollSupport {
// 'shift' here - distance between editor's top and first line of range
// make whole range visible. If possible, locate it at 'center' (1/3 of height)
// make whole range visible. If possible, locate it at 'center' (1/3 of height) (or at 'preferredTopShift' if it was specified)
// If can't show whole range - show as much as we can
boolean canShow = 2 * gapLines[i] + rangeHeights[i] <= editorHeights[i];
topShifts[i] = canShow ? Math.min(editorHeights[i] - gapLines[i] - rangeHeights[i], editorHeights[i] / 3) : gapLines[i];
int shift = preferredTopShift != -1 ? preferredTopShift : editorHeights[i] / 3;
topShifts[i] = canShow ? Math.min(editorHeights[i] - gapLines[i] - rangeHeights[i], shift) : gapLines[i];
}
int topShift = min(topShifts);
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/tool/ApplyPatchChange.java
+13 -9
View File
@@ -19,12 +19,10 @@ import com.intellij.diff.comparison.ByWord;
import com.intellij.diff.comparison.ComparisonPolicy;
import com.intellij.diff.fragments.DiffFragment;
import com.intellij.diff.tools.util.SyncScrollSupport;
import com.intellij.diff.util.DiffDrawUtil;
import com.intellij.diff.util.DiffUtil;
import com.intellij.diff.util.LineRange;
import com.intellij.diff.util.TextDiffType;
import com.intellij.diff.util.*;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.LogicalPosition;
import com.intellij.openapi.editor.ex.DocumentEx;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.MarkupModelEx;
@@ -102,21 +100,27 @@ class ApplyPatchChange {
RangeHighlighter highlighter = markupModel.addRangeHighlighter(textRange.getStartOffset(), textRange.getEndOffset(),
HighlighterLayer.LAST, null, HighlighterTargetArea.LINES_IN_RANGE);
PairConsumer<Editor, MouseEvent> clickHandler = myAppliedTo != null ? (ed, e) -> handleStatusClick(editor) : null;
PairConsumer<Editor, MouseEvent> clickHandler = myAppliedTo != null ? (e, event) -> handleStatusClick(editor, event) : null;
highlighter.setLineMarkerRenderer(LineStatusMarkerRenderer.createRenderer(line1, line2, color, clickHandler));
myHighlighters.add(highlighter);
}
private void handleStatusClick(@NotNull EditorEx editor) {
// TODO: avoid scrolling clicked editor, if possible
// TODO: blink ranges, to make them more noticeable ?
private void handleStatusClick(@NotNull EditorEx editor, @NotNull MouseEvent event) {
assert myAppliedTo != null;
EditorEx resultEditor = myViewer.getResultEditor();
EditorEx patchEditor = myViewer.getPatchEditor();
Side clickSide = Side.fromLeft(editor == resultEditor);
int clickLine = clickSide.select(myAppliedTo.start, myPatchInsertionRange.start);
EditorEx clickEditor = clickSide.select(resultEditor, patchEditor);
int targetY = clickEditor.logicalPositionToXY(new LogicalPosition(clickLine, 0)).y;
int topShift = targetY - clickEditor.getScrollingModel().getVerticalScrollOffset();
int[] offsets = SyncScrollSupport.getTargetOffsets(resultEditor, patchEditor,
myAppliedTo.start, myAppliedTo.end,
myPatchInsertionRange.start, myPatchInsertionRange.end);
myPatchInsertionRange.start, myPatchInsertionRange.end,
topShift);
DiffUtil.scrollToPoint(resultEditor, new Point(0, offsets[0]), false);
DiffUtil.scrollToPoint(patchEditor, new Point(0, offsets[1]), false);
}