Merge "Do not skip lines marked as dueToMove"
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts
index 155da60..43d8781 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts
@@ -102,7 +102,6 @@
import {RevisionInfo as RevisionInfoObj} from '../../shared/revision-info/revision-info';
import {CommentMap} from '../../../utils/comment-util';
import {AppElementParams} from '../../gr-app-types';
-import {FetchParams} from '../../shared/gr-rest-api-interface/gr-rest-apis/gr-rest-api-helper';
const ERR_REVIEW_STATUS = 'Couldn’t change file review status.';
const MSG_LOADING_BLAME = 'Loading blame...';
@@ -876,12 +875,8 @@
}
_initLineOfInterestAndCursor(leftSide: boolean) {
- this.$.diffHost.lineOfInterest = this._getLineOfInterest({
- leftSide,
- });
- this._initCursor({
- leftSide,
- });
+ this.$.diffHost.lineOfInterest = this._getLineOfInterest(leftSide);
+ this._initCursor(leftSide);
}
_displayDiffBaseAgainstLeftToast() {
@@ -1197,11 +1192,11 @@
/**
* If the params specify a diff address then configure the diff cursor.
*/
- _initCursor(params: FetchParams) {
+ _initCursor(leftSide: boolean) {
if (this._focusLineNum === undefined) {
return;
}
- if (params.leftSide) {
+ if (leftSide) {
this.$.cursor.side = Side.LEFT;
} else {
this.$.cursor.side = Side.RIGHT;
@@ -1209,14 +1204,14 @@
this.$.cursor.initialLineNumber = this._focusLineNum;
}
- _getLineOfInterest(params: FetchParams): LineOfInterest | undefined {
+ _getLineOfInterest(leftSide: boolean): LineOfInterest | undefined {
// If there is a line number specified, pass it along to the diff so that
// it will not get collapsed.
if (!this._focusLineNum) {
return undefined;
}
- return {number: this._focusLineNum, leftSide: !!params.leftSide};
+ return {number: this._focusLineNum, leftSide};
}
_pathChanged(path: string) {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
index 7d18527..ac70287 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
@@ -1238,42 +1238,42 @@
assert.isNotOk(element.$.cursor.initialLineNumber);
// Does nothing when params specify no cursor address:
- element._initCursor({});
+ element._initCursor(false);
assert.isNotOk(element.$.cursor.initialLineNumber);
// Does nothing when params specify side but no number:
- element._initCursor({leftSide: true});
+ element._initCursor(true);
assert.isNotOk(element.$.cursor.initialLineNumber);
// Revision hash: specifies lineNum but not side.
element._focusLineNum = 234;
- element._initCursor({});
+ element._initCursor(false);
assert.equal(element.$.cursor.initialLineNumber, 234);
assert.equal(element.$.cursor.side, 'right');
// Base hash: specifies lineNum and side.
element._focusLineNum = 345;
- element._initCursor({leftSide: true});
+ element._initCursor(true);
assert.equal(element.$.cursor.initialLineNumber, 345);
assert.equal(element.$.cursor.side, 'left');
// Specifies right side:
element._focusLineNum = 123;
- element._initCursor({leftSide: false});
+ element._initCursor(false);
assert.equal(element.$.cursor.initialLineNumber, 123);
assert.equal(element.$.cursor.side, 'right');
});
test('_getLineOfInterest', () => {
- assert.isUndefined(element._getLineOfInterest({}));
+ assert.isUndefined(element._getLineOfInterest(false));
element._focusLineNum = 12;
- let result = element._getLineOfInterest({});
+ let result = element._getLineOfInterest(false);
assert.equal(result.number, 12);
assert.isNotOk(result.leftSide);
- result = element._getLineOfInterest({leftSide: true});
+ result = element._getLineOfInterest(true);
assert.equal(result.number, 12);
assert.isOk(result.leftSide);
});
diff --git a/polygerrit-ui/app/types/common.ts b/polygerrit-ui/app/types/common.ts
index 81eae16..57e39d4 100644
--- a/polygerrit-ui/app/types/common.ts
+++ b/polygerrit-ui/app/types/common.ts
@@ -481,6 +481,7 @@
topic?: ActionInfo;
hashtags?: ActionInfo;
assignee?: ActionInfo;
+ ready?: ActionInfo;
}
/**
