Fix conflicts

This commit is contained in:
Daniel Imms
2018-04-24 10:55:53 -07:00
4 changed files with 88 additions and 98 deletions
+6 -9
View File
@@ -73,12 +73,11 @@ export class AltClickHandler {
private _resetStartingRow(): string {
if (this._moveToRequestedRow().length === 0) {
return '';
} else {
return repeat(this._bufferLine(
this._startCol, this._startRow, this._startCol,
this._startRow - this._wrappedRowsForRow(this._startRow), false
).length, this._sequence(Direction.LEFT));
}
return repeat(this._bufferLine(
this._startCol, this._startRow, this._startCol,
this._startRow - this._wrappedRowsForRow(this._startRow), false
).length, this._sequence(Direction.LEFT));
}
/**
@@ -180,9 +179,8 @@ export class AltClickHandler {
(this._startCol >= this._endCol &&
startRow < this._endRow)) { // down/left or same y/left
return Direction.RIGHT;
} else {
return Direction.LEFT;
}
return Direction.LEFT;
}
/**
@@ -191,9 +189,8 @@ export class AltClickHandler {
private _verticalDirection(): Direction {
if (this._startRow > this._endRow) {
return Direction.UP;
} else {
return Direction.DOWN;
}
return Direction.DOWN;
}
/**