opendev/gerrit
Code Issues Proposed changes

New unified diff based on CodeMirror

Browse Source 
Migrate unified diff screen from prettify to CodeMirror, reusing as much as
possible from the side by side diff view.

This now builds and mostly works.

TODO:
1. Maybe implement proper behavior for range based comments.
   - Currently, pressing 'c' with text selected does not open a comment.
2. Support hiding line numbers in Unified.
3. Factor out more common code, minimize duplication.
   - UnifiedCommentManager and SideBySideCommentManager.
   - UnifiedSkipBar and SideBySideSkipBar.

These will be addressed in follow-up commits.

Change-Id: I91935613510879436a911ff1dcc191c729f0f06d
This commit is contained in:
Michael Zhou
2013-08-20 22:58:39 -07:00
committed by David Pursehouse
parent cacac00870
commit f156a4d76a
42 changed files with 4372 additions and 1838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
View File

@@ -20,6 +20,7 @@ import com.google.gerrit.client.changes.ChangeApi;
import com.google.gerrit.client.changes.ReviewInfo;
import com.google.gerrit.client.changes.Util;
import com.google.gerrit.client.diff.DiffInfo.Region;
import com.google.gerrit.client.diff.DiffScreen.DiffScreenType;
import com.google.gerrit.client.info.ChangeInfo;
import com.google.gerrit.client.info.ChangeInfo.RevisionInfo;
import com.google.gerrit.client.info.FileInfo;
@@ -89,6 +90,7 @@ public class Header extends Composite {
private final PatchSet.Id base;
private final PatchSet.Id patchSetId;
private final String path;
private final DiffScreenType diffScreenType;
private boolean hasPrev;
private boolean hasNext;
private String nextPath;
@@ -96,12 +98,13 @@ public class Header extends Composite {
private ReviewedState reviewedState;
Header(KeyCommandSet keys, PatchSet.Id base, PatchSet.Id patchSetId,
String path) {
String path, DiffScreenType diffSreenType) {
initWidget(uiBinder.createAndBindUi(this));
this.keys = keys;
this.base = base;
this.patchSetId = patchSetId;
this.path = path;
this.diffScreenType = diffSreenType;
if (!Gerrit.isSignedIn()) {
reviewed.getElement().getStyle().setVisibility(Visibility.HIDDEN);
@@ -267,9 +270,9 @@ public class Header extends Composite {
}
private String url(FileInfo info) {
return info.binary()
? Dispatcher.toUnified(base, patchSetId, info.path())
: Dispatcher.toSideBySide(base, patchSetId, info.path());
return diffScreenType == DiffScreenType.UNIFIED || info.binary()
? Dispatcher.toUnified(base, patchSetId, info.path())
: Dispatcher.toSideBySide(base, patchSetId, info.path());
}
private KeyCommand setupNav(InlineHyperlink link, char key, String help, FileInfo info) {