Skip to content

Commit e19f1af

Browse files
authored
Merge pull request microsoft#186655 from microsoft/hediet/b/binding-sailfish
Fixes microsoft#186628
2 parents 7e46f23 + 2e4e489 commit e19f1af

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

src/vs/editor/common/cursor/cursorMoveOperations.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { CursorConfiguration, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
6+
import * as strings from 'vs/base/common/strings';
7+
import { Constants } from 'vs/base/common/uint';
78
import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
89
import { Position } from 'vs/editor/common/core/position';
910
import { Range } from 'vs/editor/common/core/range';
10-
import * as strings from 'vs/base/common/strings';
11-
import { Constants } from 'vs/base/common/uint';
1211
import { AtomicTabMoveOperations, Direction } from 'vs/editor/common/cursor/cursorAtomicMoveOperations';
12+
import { CursorConfiguration, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from 'vs/editor/common/cursorCommon';
1313
import { PositionAffinity } from 'vs/editor/common/model';
1414

1515
export class CursorPosition {
@@ -213,7 +213,15 @@ export class MoveOperations {
213213
column = cursor.position.column;
214214
}
215215

216-
const r = MoveOperations.down(config, model, lineNumber, column, cursor.leftoverVisibleColumns, linesCount, true);
216+
let i = 0;
217+
let r: CursorPosition;
218+
do {
219+
r = MoveOperations.down(config, model, lineNumber + i, column, cursor.leftoverVisibleColumns, linesCount, true);
220+
const np = model.normalizePosition(new Position(r.lineNumber, r.column), PositionAffinity.None);
221+
if (np.lineNumber > lineNumber) {
222+
break;
223+
}
224+
} while (i++ < 10 && lineNumber + i < model.getLineCount());
217225

218226
return cursor.move(inSelectionMode, r.lineNumber, r.column, r.leftoverVisibleColumns);
219227
}

0 commit comments

Comments
 (0)