mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 02:48:30 -05:00
VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)
* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9 * delete unused folders * distro * Bump build node version * update chokidar * FIx hygiene errors * distro * Fix extension lint issues * Remove strict-vscode * Add copyright header exemptions * Bump vscode-extension-telemetry to fix webpacking issue with zone.js * distro * Fix failing tests (revert marked.js back to current one until we decide to update) * Skip searchmodel test * Fix mac build * temp debug script loading * Try disabling coverage * log error too * Revert "log error too" This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f. * Revert "temp debug script loading" This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c. * Add comments explaining coverage disabling * Fix ansi_up loading issue * Merge latest from ads * Use newer option * Fix compile * add debug logging warn * Always log stack * log more * undo debug * Update to use correct base path (+cleanup) * distro * fix compile errors * Remove strict-vscode * Fix sql editors not showing * Show db dropdown input & fix styling * Fix more info in gallery * Fix gallery asset requests * Delete unused workflow * Fix tapable resolutions for smoke test compile error * Fix smoke compile * Disable crash reporting * Disable interactive Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
@@ -9,10 +9,10 @@ import { Range } from 'vs/editor/common/core/range';
|
||||
import * as strings from 'vs/base/common/strings';
|
||||
import { Constants } from 'vs/base/common/uint';
|
||||
import { AtomicTabMoveOperations, Direction } from 'vs/editor/common/controller/cursorAtomicMoveOperations';
|
||||
import { PositionNormalizationAffinity } from 'vs/editor/common/model';
|
||||
import { PositionAffinity } from 'vs/editor/common/model';
|
||||
|
||||
export class CursorPosition {
|
||||
_cursorPositionBrand: void;
|
||||
_cursorPositionBrand: void = undefined;
|
||||
|
||||
public readonly lineNumber: number;
|
||||
public readonly column: number;
|
||||
@@ -75,7 +75,7 @@ export class MoveOperations {
|
||||
const pos = cursor.position.delta(undefined, -(noOfColumns - 1));
|
||||
// We clip the position before normalization, as normalization is not defined
|
||||
// for possibly negative columns.
|
||||
const normalizedPos = model.normalizePosition(MoveOperations.clipPositionColumn(pos, model), PositionNormalizationAffinity.Left);
|
||||
const normalizedPos = model.normalizePosition(MoveOperations.clipPositionColumn(pos, model), PositionAffinity.Left);
|
||||
const p = MoveOperations.left(config, model, normalizedPos);
|
||||
|
||||
lineNumber = p.lineNumber;
|
||||
@@ -144,7 +144,7 @@ export class MoveOperations {
|
||||
column = cursor.selection.endColumn;
|
||||
} else {
|
||||
const pos = cursor.position.delta(undefined, noOfColumns - 1);
|
||||
const normalizedPos = model.normalizePosition(MoveOperations.clipPositionColumn(pos, model), PositionNormalizationAffinity.Right);
|
||||
const normalizedPos = model.normalizePosition(MoveOperations.clipPositionColumn(pos, model), PositionAffinity.Right);
|
||||
const r = MoveOperations.right(config, model, normalizedPos);
|
||||
lineNumber = r.lineNumber;
|
||||
column = r.column;
|
||||
|
||||
Reference in New Issue
Block a user