opendev/gerrit
Code Issues Proposed changes

Side-By-Side: Adjust line number when using 'm' to edit commit message

Browse Source 
When the commit message is displayed in the side-by-side screen the
commit header is also shown, which includes the commit parent(s),
committer name and timestamp, and author name and timestamp.

When the cursor is on the commit message's title and the user presses
the 'm' key to jump to the editor, the line number in the side-by-side
view is different to the line number in the editor because the header
lines are not included in the editor. This causes the focus to be set
on the wrong line in the editor.

When jumping to the editor from the commit message, adjust the line
number to take the header lines into account.

Bug: Issue 3217
Change-Id: Ieb61dd343b6da77cd0df2d1255adb77c61b83ac9
This commit is contained in:
David Pursehouse
2015-02-27 19:20:52 +09:00
parent 73c0395fe4
commit a988fefb4a
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
View File

@@ -894,12 +894,59 @@ public class SideBySide extends Screen {
};
}
private int adjustCommitMessageLine(int line) {
/* When commit messages are shown in the side-by-side screen they include
a header block that looks like this:
1 Parent: deadbeef (Parent commit title)
2 Author: A. U. Thor <author@example.com>
3 AuthorDate: 2015-02-27 19:20:52 +0900
4 Commit: A. U. Thor <author@example.com>
5 CommitDate: 2015-02-27 19:20:52 +0900
6 [blank line]
7 Commit message title
8
9 Commit message body
10 ...
11 ...
If the commit is a merge commit, both parent commits are listed in the
first two lines instead of a 'Parent' line:
1 Merge Of: deadbeef (Parent 1 commit title)
2 beefdead (Parent 2 commit title)
*/
// Offset to compensate for header lines until the blank line
// after 'CommitDate'
int offset = 6;
// Adjust for merge commits, which have two parent lines
if (diff.text_b().startsWith("Merge")) {
offset += 1;
}
// If the cursor is inside the header line, reset to the first line of the
// commit message. Otherwise if the cursor is on an actual line of the commit
// message, adjust the line number to compensate for the header lines, so the
// focus is on the correct line.
if (line <= offset) {
return 1;
} else {
return line - offset;
}
}
private Runnable modifyInEditScreen(final CodeMirror cm) {
return new Runnable() {
@Override
public void run() {
LineHandle handle = cm.extras().activeLine();
int line = cm.getLineNumber(handle) + 1;
if (Patch.COMMIT_MSG.equals(path)) {
line = adjustCommitMessageLine(line);
}
String token = Dispatcher.toEditScreen(revision, path, line);
if (!Gerrit.isSignedIn()) {
Gerrit.doSignIn(token);