opendev/gerrit
Code Issues Proposed changes

Remove dead code in newDraftOnGutterClick()

Browse Source 
If a line number gutter is clicked, we always reset the cursor
to the corresponding line and insert a line comment, so
cm.somethingSelected() will always be false. The code was copied
verbatim from newDraft() and should be removed.

Change-Id: I426b090778856587cf750e1aabe4c0c220c2b712
This commit is contained in:
Michael Zhou
2016-03-26 22:27:33 -04:00
parent f5956d2da5
commit 7e7702653e
2 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideCommentManager.java
View File

@@ -156,23 +156,7 @@ class SideBySideCommentManager extends CommentManager {
@Override
void newDraftOnGutterClick(CodeMirror cm, String gutterClass, int line) {
if (cm.somethingSelected()) {
FromTo fromTo = cm.getSelectedRange();
Pos end = fromTo.to();
if (end.ch() == 0) {
end.line(end.line() - 1);
end.ch(cm.getLine(end.line()).length());
}
addDraftBox(cm.side(), CommentInfo.create(
getPath(),
getStoredSideFromDisplaySide(cm.side()),
line,
CommentRange.create(fromTo))).setEdit(true);
cm.setSelection(cm.getCursor());
} else {
insertNewDraft(cm.side(), line);
}
insertNewDraft(cm.side(), line);
}
/**

25
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedCommentManager.java
View File

@@ -26,7 +26,6 @@ import com.google.gwt.core.client.JsArray;
import net.codemirror.lib.CodeMirror;
import net.codemirror.lib.CodeMirror.LineHandle;
import net.codemirror.lib.Pos;
import net.codemirror.lib.TextMarker.FromTo;
import java.util.ArrayList;
import java.util.List;
@@ -155,29 +154,7 @@ class UnifiedCommentManager extends CommentManager {
DisplaySide side = gutterClass.equals(UnifiedTable.style.lineNumbersLeft())
? DisplaySide.A
: DisplaySide.B;
if (cm.somethingSelected()) {
FromTo fromTo = cm.getSelectedRange();
Pos end = fromTo.to();
if (end.ch() == 0) {
end.line(end.line() - 1);
end.ch(cm.getLine(end.line()).length());
}
LineSidePair pair = host.getLineSidePairFromCmLine(cmLinePlusOne - 1);
int line = pair.getLine();
if (pair.getSide() != side) {
line = host.lineOnOther(pair.getSide(), line).getLine();
}
addDraftBox(side, CommentInfo.create(
getPath(),
getStoredSideFromDisplaySide(side),
line + 1,
CommentRange.create(fromTo))).setEdit(true);
cm.setSelection(cm.getCursor());
} else {
insertNewDraft(side, cmLinePlusOne);
}
insertNewDraft(side, cmLinePlusOne);
}
/**