opendev/gerrit
Code Issues Proposed changes

Merge "SideBySide2: Don't wrap n/p around to find next diff chunk"

Browse Source
This commit is contained in:
Shawn Pearce
2013-12-12 21:29:01 +00:00
committed by Gerrit Code Review
parent 592b8bd417 6bbc36b97d
commit fbd91eaf7a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
View File

@@ -1404,14 +1404,21 @@ public class SideBySide2 extends Screen {
if (res < 0) { if (res < 0) {
res = -res - (prev ? 1 : 2); res = -res - (prev ? 1 : 2);
} }
res = res + (prev ? -1 : 1); res = res + (prev ? -1 : 1);
DiffChunkInfo lookUp = diffChunks.get(getWrapAroundDiffChunkIndex(res)); if (res < 0 || diffChunks.size() <= res) {
return;
}
DiffChunkInfo lookUp = diffChunks.get(res);
// If edit, skip the deletion chunk and set focus on the insertion one. // If edit, skip the deletion chunk and set focus on the insertion one.
if (lookUp.isEdit() && lookUp.getSide() == DisplaySide.A) { if (lookUp.isEdit() && lookUp.getSide() == DisplaySide.A) {
res = res + (prev ? -1 : 1); res = res + (prev ? -1 : 1);
if (res < 0 || diffChunks.size() <= res) {
return;
} }
DiffChunkInfo target = diffChunks.get(getWrapAroundDiffChunkIndex(res)); }
DiffChunkInfo target = diffChunks.get(res);
CodeMirror targetCm = getCmFromSide(target.getSide()); CodeMirror targetCm = getCmFromSide(target.getSide());
targetCm.setCursor(LineCharacter.create(target.getStart())); targetCm.setCursor(LineCharacter.create(target.getStart()));
targetCm.focus(); targetCm.focus();
@@ -1467,10 +1474,6 @@ public class SideBySide2 extends Screen {
return null; return null;
} }
private int getWrapAroundDiffChunkIndex(int index) {
return (index + diffChunks.size()) % diffChunks.size();
}
void defer(Runnable thunk) { void defer(Runnable thunk) {
if (deferred == null) { if (deferred == null) {
final ArrayList<Runnable> list = new ArrayList<Runnable>(); final ArrayList<Runnable> list = new ArrayList<Runnable>();