mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-09 17:52:34 -05:00
* Squash merge commits for 1.26 (#1) (#2323) * Polish tag search as per feedback (#55269) * Polish tag search as per feedback * Updated regex * Allow users to opt-out of features that send online requests in the background (#55097) * settings sweep #54690 * Minor css tweaks to enable eoverflow elipsis in more places (#55277) * fix an issue with titlebarheight when not scaling with zoom * Settings descriptions update #54690 * fixes #55209 * Settings editor - many padding fixes * More space above level 2 label * Fixing Cannot debug npm script using Yarn #55103 * Settings editor - show ellipsis when description overflows * Settings editor - ... fix measuring around links, relayout * Setting descriptions * Settings editor - fix ... for some short lines, fix select container width * Settings editor - overlay trees so scrollable shadow is full width * Fix #54133 - missing extension settings after reload * Settings color token description tweak * Settings editor - disable overflow indicator temporarily, needs to be faster * Added command to Run the selected npm script * fixes #54452 * fixes #54929 * fixes #55248 * prefix command with extension name * Contribute run selected to the context menu * node-debug@1.26.6 * Allow terminal rendererType to be swapped out at runtime Part of #53274 Fixes #55344 * Settings editor - fix not focusing search when restoring editor setInput must be actually async. Will be fixed naturally when we aren't using winJS promises... * Settings editor - TOC should only expand the section with a selected item * Bump node-debug2 * Settings editor - Tree focus outlines * Settings editor - don't blink the scrollbar when toc selection changes And hide TOC correctly when the editor is narrow * Settings editor - header rows should not be selectable * fixes #54877 * change debug assignee to isi * Settings sweep (#54690) * workaround for #55051 * Settings sweep (#54690) * settings sweep #54690 * Don't try closing tags when you type > after another > * Describe what implementation code lens does Fixes #55370 * fix javadoc formatter setting description * fixes #55325 * update to officical TS version * Settings editor - Even more padding, use semibold instead of bold * Fix #55357 - fix TOC twistie * fixes #55288 * explorer: refresh on di change file system provider registration fixes #53256 * Disable push to Linux repo to test standalone publisher * New env var to notify log level to extensions #54001 * Disable snippets in extension search (when not in suggest dropdown) (#55281) * Disable snippits in extension search (when not in suggest dropdown) * Add monaco input contributions * Fix bug preventing snippetSuggestions from taking effect in sub-editors * Latest emmet helper to fix #52366 * Fix comment updates for threads within same file * Allow extensions to log telemetry to log files #54001 * Pull latest css grammar * files.exclude control - use same style for "add" vs "edit" * files.exclude control - focus/keyboard behavior * don't show menubar too early * files.exclude - better styling * Place cursor at end of extensions search box on autofill (#55254) * Place cursor at end of extensions search box on autofill * Use position instead of selection * fix linux build issue (empty if block) * Settings editor - fix extension category prefixes * Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO * File/Text search provider docs * Fixes #52655 * Include epoch (#55008) * Fixes #53385 * Fixes #49480 * VS Code Insiders (Users) not opening Fixes #55353 * Better handling of the case when the extension host fails to start * Fixes #53966 * Remove confusing Start from wordPartLeft commands ID * vscode-xterm@3.6.0-beta12 Fixes #55488 * Initial size is set to infinity!! Fixes #55461 * Polish embeddedEditorBackground * configuration service misses event * Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query * Select all not working in issue reporter on mac, fixes #55424 * Disable fuzzy matching for extensions autosuggest (#55498) * Fix clipping of extensions search border in some third party themes (#55504) * fixes #55538 * Fix bug causing an aria alert to not be shown the third time (and odd numbers thereafter) * Settings editor - work around rendering glitch with webkit-line-clamp * Settings editor - revert earlier '...' changes * Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason * Settings editor - better overflow indicator * Don't show existing filters in autocomplete (#55495) * Dont show existing filters in autocomplete * Simplify * Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543) * fixes #55223 * Update vscode-css-languageservice to 3.0.10-next.1 * Fix #55509 - settings navigation * Fix #55519 * Fix #55520 * FIx #55524 * Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly * oss updates for endgame * Fix unit tests * fixes #55522 * Avoid missing manifest error from bubbling up #54757 * Settings format crawl * Search provider - Fix FileSearchProvider to return array, not progress * Fix #55598 * Settings editor - fix NPE rendering settings with no description * dont render inden guides in search box (#55600) * fixes #55454 * More settings crawl * Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex * Fix FileSearchProvider unit tests for progress change * fixes #55561 * Settings description update for #54690 * Update setting descriptions for online services * Minor edits * fixes #55513 * fixes #55451 * Fix #55612 - fix findTextInFiles cancellation * fixes #55539 * More setting description tweaks * Setting to disable online experiments #54354 * fixes #55507 * fixes #55515 * Show online services action only in Insiders for now * Settings editor - change toc behavior default to 'filter' * Settings editor - nicer filter count style during search * Fix #55617 - search viewlet icons * Settings editor - better styling for element count indicator * SearchProvider - fix NPE when searching extraFileResources * Allow extends to work without json suffix Fixes #16905 * Remove accessability options logic entirely Follow up on #55451 * use latest version of DAP * fixes #55490 * fixes #55122 * fixes #52332 * Avoid assumptions about git: URIs (fixes #36236) * relative path for descriptions * resourece: get rid of isFile context key fixes #48275 * Register previous ids for compatibility (#53497) * more tuning for #48275 * no need to always re-read "files explorer" fixes #52003 * read out active composites properly fixes #51967 * Update link colors for hc theme to meet color contrast ratio, fixes #55651 Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated * detect 'winpty-agent.exe'; fixes #55672 * node-debug@1.26.7 * reset counter on new label * Settings editor - fix multiple setting links in one description * Settings editor - color code blocks in setting descriptions, fix #55532 * Settings editor - hover color in TOC * Settings editor - fix navigation NPE * Settings editor - fix text control width * Settings editor - maybe fix #55684 * Fix bug causing cursor to not move on paste * fixes #53582 * Use ctrlCmd instead of ctrl for go down from search box * fixes #55264 * fixes #55456 * filter for spcaes before triggering search (#55611) * Fix #55698 - don't lose filtered TOC counts when refreshing TOC * fixes #55421 * fixes #28979 * fixes #55576 * only add check for updates to windows/linux help * readonly files: append decoration to label fixes #53022 * debug: do not show toolbar while initialising fixes #55026 * Opening launch.json should not activate debug extensions fixes #55029 * fixes #55435 * fixes #55434 * fixes #55439 * trigger menu only on altkey up * Fix #50555 - fix settings editor memory leak * Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render * fixes #55335 * proper fix for readonly model fixes #53022 * improve FoldingRangeKind spec (for #55686) * Use class with static fields (fixes #55494) * Fixes #53671 * fixes #54630 * [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324 * cleanup deps * debug issues back to andre * update electron for smoketest * Fix #55757 - prevent settings tabs from overflowing * Fix #53897 - revert setting menu defaults to old editor * Add enum descriptions to `typescript.preferences.importModuleSpecifier` * Fix #55767 - leaking style elements from settings editor * Fix #55521 - prevent flashing when clicking in exclude control * Update Git modified color for contrast ratio, fixes #53140 * Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. * Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode"" This reverts commit 53949d963f39e40757557c6526332354a31d9154. * don't ask to install an incomplete menu * Fix NPE in terminal AccessibilityManager Fixes #55744 * don't display fallback menu unless we've closed the last window * fixes #55547 * Fix smoke tests for extension search box * Update OSSREADME.json for Electron 2.0.5 * Update distro Includes Chromium license changes * fix #55455 * fix #55865 * fixes #55893 * Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805) * Fix bug causing workspace recommendations to go away upon ignoring a recommendation * ONly show on @recommended or @recommended:workspace * Make more consistant * Fix #55911 * Understand json activity (#55926) * Understand json file activity * Refactoring * adding composer.json * Distro update for experiments * use terminal.processId for auto-attach; fixes #55918 * Reject invalid URI with vscode.openFolder (for #55891) * improve win32 setup system vs user detection fixes #55840 fixes #55840 delay winreg import related to #55840 show notification earlier related to #55840 fix #55840 update inno setup message related to #55840 * Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead * Bring back the old menu due to electron 2.0 issues (#55913) * add the old menu back for native menus * make menu labels match * `vscode.openFolder`: treat missing URI schema gracefully (for #55891) * delay EH reattach; fixes #55955 * Mark all json files under appSettingsHome as settings * Use localized strings for telemetry opt-out * Exception when saving file editor opened from remote file provider (fixes #55051) * Remove terminal menu from stable Fixes 56003 * VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933 * improve fix for #55891 * fix #55916 * Improve #55891 * increase EH debugging restart delay; fixes #55955 * Revert "Don't include non-resource entries in history quick pick" This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060. * Diff editor: horizontal scrollbar height is smaller (fixes #56062) * improve openFolder uri fix (correctly treat backslashes) * fixes #56116 repair ipc for native menubar keybindings * Fix #56240 - Open the JSON settings editor instead of the UI editor * Fix #55536 * uriDisplay: if no formatter is registered fall back to getPathlabel fixes #56104 * VSCode hangs when opening python file. Fixes #56377 * VS Code Hangs When Opening Specific PowerShell File. Fixes #56430 * Fix #56433 - search extraFileResources even when no folders open * Workaround #55649 * Fix in master #56371 * Fix tests #56371 * Fix in master #56317 * increase version to 1.26.1 * Fixes #56387: Handle SIGPIPE in extension host * fixes #56185 * Fix merge issues (part 1) * Fix build breaks (part 1) * Build breaks (part 2) * Build breaks (part 3) * More build breaks (part 4) * Fix build breaks (part 5) * WIP * Fix menus * Render query result and message panels (#2363) * Put back query editor hot exit changes * Fix grid changes that broke profiler (#2365) * Update APIs for saving query editor state * Fix restore view state for profiler and edit data * Updating custom default themes to support 4.5:1 contrast ratio * Test updates * Fix Extension Manager and Windows Setup * Update license headers * Add appveyor and travis files back * Fix hidden modal dropdown issue
778 lines
30 KiB
TypeScript
778 lines
30 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
'use strict';
|
|
|
|
import { SingleCursorState, ICursorSimpleModel, CursorState, CursorContext } from 'vs/editor/common/controller/cursorCommon';
|
|
import { Position, IPosition } from 'vs/editor/common/core/position';
|
|
import { Range } from 'vs/editor/common/core/range';
|
|
import { MoveOperations } from 'vs/editor/common/controller/cursorMoveOperations';
|
|
import { WordOperations } from 'vs/editor/common/controller/cursorWordOperations';
|
|
import * as types from 'vs/base/common/types';
|
|
import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
|
|
|
|
export class CursorMoveCommands {
|
|
|
|
public static addCursorDown(context: CursorContext, cursors: CursorState[], useLogicalLine: boolean): CursorState[] {
|
|
let result: CursorState[] = [], resultLen = 0;
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[resultLen++] = new CursorState(cursor.modelState, cursor.viewState);
|
|
if (useLogicalLine) {
|
|
result[resultLen++] = CursorState.fromModelState(MoveOperations.translateDown(context.config, context.model, cursor.modelState));
|
|
} else {
|
|
result[resultLen++] = CursorState.fromViewState(MoveOperations.translateDown(context.config, context.viewModel, cursor.viewState));
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public static addCursorUp(context: CursorContext, cursors: CursorState[], useLogicalLine: boolean): CursorState[] {
|
|
let result: CursorState[] = [], resultLen = 0;
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[resultLen++] = new CursorState(cursor.modelState, cursor.viewState);
|
|
if (useLogicalLine) {
|
|
result[resultLen++] = CursorState.fromModelState(MoveOperations.translateUp(context.config, context.model, cursor.modelState));
|
|
} else {
|
|
result[resultLen++] = CursorState.fromViewState(MoveOperations.translateUp(context.config, context.viewModel, cursor.viewState));
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public static moveToBeginningOfLine(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = this._moveToLineStart(context, cursor, inSelectionMode);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
private static _moveToLineStart(context: CursorContext, cursor: CursorState, inSelectionMode: boolean): CursorState {
|
|
const currentViewStateColumn = cursor.viewState.position.column;
|
|
const currentModelStateColumn = cursor.modelState.position.column;
|
|
const isFirstLineOfWrappedLine = currentViewStateColumn === currentModelStateColumn;
|
|
|
|
const currentViewStatelineNumber = cursor.viewState.position.lineNumber;
|
|
const firstNonBlankColumn = context.viewModel.getLineFirstNonWhitespaceColumn(currentViewStatelineNumber);
|
|
const isBeginningOfViewLine = currentViewStateColumn === firstNonBlankColumn;
|
|
|
|
if (!isFirstLineOfWrappedLine && !isBeginningOfViewLine) {
|
|
return this._moveToLineStartByView(context, cursor, inSelectionMode);
|
|
} else {
|
|
return this._moveToLineStartByModel(context, cursor, inSelectionMode);
|
|
}
|
|
}
|
|
|
|
private static _moveToLineStartByView(context: CursorContext, cursor: CursorState, inSelectionMode: boolean): CursorState {
|
|
return CursorState.fromViewState(
|
|
MoveOperations.moveToBeginningOfLine(context.config, context.viewModel, cursor.viewState, inSelectionMode)
|
|
);
|
|
}
|
|
|
|
private static _moveToLineStartByModel(context: CursorContext, cursor: CursorState, inSelectionMode: boolean): CursorState {
|
|
return CursorState.fromModelState(
|
|
MoveOperations.moveToBeginningOfLine(context.config, context.model, cursor.modelState, inSelectionMode)
|
|
);
|
|
}
|
|
|
|
public static moveToEndOfLine(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = this._moveToLineEnd(context, cursor, inSelectionMode);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
private static _moveToLineEnd(context: CursorContext, cursor: CursorState, inSelectionMode: boolean): CursorState {
|
|
const viewStatePosition = cursor.viewState.position;
|
|
const viewModelMaxColumn = context.viewModel.getLineMaxColumn(viewStatePosition.lineNumber);
|
|
const isEndOfViewLine = viewStatePosition.column === viewModelMaxColumn;
|
|
|
|
const modelStatePosition = cursor.modelState.position;
|
|
const modelMaxColumn = context.model.getLineMaxColumn(modelStatePosition.lineNumber);
|
|
const isEndLineOfWrappedLine = viewModelMaxColumn - viewStatePosition.column === modelMaxColumn - modelStatePosition.column;
|
|
|
|
if (isEndOfViewLine || isEndLineOfWrappedLine) {
|
|
return this._moveToLineEndByModel(context, cursor, inSelectionMode);
|
|
} else {
|
|
return this._moveToLineEndByView(context, cursor, inSelectionMode);
|
|
}
|
|
}
|
|
|
|
private static _moveToLineEndByView(context: CursorContext, cursor: CursorState, inSelectionMode: boolean): CursorState {
|
|
return CursorState.fromViewState(
|
|
MoveOperations.moveToEndOfLine(context.config, context.viewModel, cursor.viewState, inSelectionMode)
|
|
);
|
|
}
|
|
|
|
private static _moveToLineEndByModel(context: CursorContext, cursor: CursorState, inSelectionMode: boolean): CursorState {
|
|
return CursorState.fromModelState(
|
|
MoveOperations.moveToEndOfLine(context.config, context.model, cursor.modelState, inSelectionMode)
|
|
);
|
|
}
|
|
|
|
public static expandLineSelection(context: CursorContext, cursors: CursorState[]): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
|
|
const viewSelection = cursor.viewState.selection;
|
|
const startLineNumber = viewSelection.startLineNumber;
|
|
const lineCount = context.viewModel.getLineCount();
|
|
|
|
let endLineNumber = viewSelection.endLineNumber;
|
|
let endColumn: number;
|
|
if (endLineNumber === lineCount) {
|
|
endColumn = context.viewModel.getLineMaxColumn(lineCount);
|
|
} else {
|
|
endLineNumber++;
|
|
endColumn = 1;
|
|
}
|
|
|
|
result[i] = CursorState.fromViewState(new SingleCursorState(
|
|
new Range(startLineNumber, 1, startLineNumber, 1), 0,
|
|
new Position(endLineNumber, endColumn), 0
|
|
));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public static moveToBeginningOfBuffer(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = CursorState.fromModelState(MoveOperations.moveToBeginningOfBuffer(context.config, context.model, cursor.modelState, inSelectionMode));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public static moveToEndOfBuffer(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = CursorState.fromModelState(MoveOperations.moveToEndOfBuffer(context.config, context.model, cursor.modelState, inSelectionMode));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public static selectAll(context: CursorContext, cursor: CursorState): CursorState {
|
|
const lineCount = context.model.getLineCount();
|
|
const maxColumn = context.model.getLineMaxColumn(lineCount);
|
|
|
|
return CursorState.fromModelState(new SingleCursorState(
|
|
new Range(1, 1, 1, 1), 0,
|
|
new Position(lineCount, maxColumn), 0
|
|
));
|
|
}
|
|
|
|
public static line(context: CursorContext, cursor: CursorState, inSelectionMode: boolean, _position: IPosition, _viewPosition: IPosition): CursorState {
|
|
const position = context.model.validatePosition(_position);
|
|
const viewPosition = (
|
|
_viewPosition
|
|
? context.validateViewPosition(new Position(_viewPosition.lineNumber, _viewPosition.column), position)
|
|
: context.convertModelPositionToViewPosition(position)
|
|
);
|
|
|
|
if (!inSelectionMode || !cursor.modelState.hasSelection()) {
|
|
// Entering line selection for the first time
|
|
const lineCount = context.model.getLineCount();
|
|
|
|
let selectToLineNumber = position.lineNumber + 1;
|
|
let selectToColumn = 1;
|
|
if (selectToLineNumber > lineCount) {
|
|
selectToLineNumber = lineCount;
|
|
selectToColumn = context.model.getLineMaxColumn(selectToLineNumber);
|
|
}
|
|
|
|
return CursorState.fromModelState(new SingleCursorState(
|
|
new Range(position.lineNumber, 1, selectToLineNumber, selectToColumn), 0,
|
|
new Position(selectToLineNumber, selectToColumn), 0
|
|
));
|
|
}
|
|
|
|
// Continuing line selection
|
|
const enteringLineNumber = cursor.modelState.selectionStart.getStartPosition().lineNumber;
|
|
|
|
if (position.lineNumber < enteringLineNumber) {
|
|
|
|
return CursorState.fromViewState(cursor.viewState.move(
|
|
cursor.modelState.hasSelection(), viewPosition.lineNumber, 1, 0
|
|
));
|
|
|
|
} else if (position.lineNumber > enteringLineNumber) {
|
|
|
|
const lineCount = context.viewModel.getLineCount();
|
|
|
|
let selectToViewLineNumber = viewPosition.lineNumber + 1;
|
|
let selectToViewColumn = 1;
|
|
if (selectToViewLineNumber > lineCount) {
|
|
selectToViewLineNumber = lineCount;
|
|
selectToViewColumn = context.viewModel.getLineMaxColumn(selectToViewLineNumber);
|
|
}
|
|
|
|
return CursorState.fromViewState(cursor.viewState.move(
|
|
cursor.modelState.hasSelection(), selectToViewLineNumber, selectToViewColumn, 0
|
|
));
|
|
|
|
} else {
|
|
|
|
const endPositionOfSelectionStart = cursor.modelState.selectionStart.getEndPosition();
|
|
return CursorState.fromModelState(cursor.modelState.move(
|
|
cursor.modelState.hasSelection(), endPositionOfSelectionStart.lineNumber, endPositionOfSelectionStart.column, 0
|
|
));
|
|
|
|
}
|
|
}
|
|
|
|
public static word(context: CursorContext, cursor: CursorState, inSelectionMode: boolean, _position: IPosition): CursorState {
|
|
const position = context.model.validatePosition(_position);
|
|
return CursorState.fromModelState(WordOperations.word(context.config, context.model, cursor.modelState, inSelectionMode, position));
|
|
}
|
|
|
|
public static cancelSelection(context: CursorContext, cursor: CursorState): CursorState {
|
|
if (!cursor.modelState.hasSelection()) {
|
|
return new CursorState(cursor.modelState, cursor.viewState);
|
|
}
|
|
|
|
const lineNumber = cursor.viewState.position.lineNumber;
|
|
const column = cursor.viewState.position.column;
|
|
|
|
return CursorState.fromViewState(new SingleCursorState(
|
|
new Range(lineNumber, column, lineNumber, column), 0,
|
|
new Position(lineNumber, column), 0
|
|
));
|
|
}
|
|
|
|
public static moveTo(context: CursorContext, cursor: CursorState, inSelectionMode: boolean, _position: IPosition, _viewPosition: IPosition): CursorState {
|
|
const position = context.model.validatePosition(_position);
|
|
const viewPosition = (
|
|
_viewPosition
|
|
? context.validateViewPosition(new Position(_viewPosition.lineNumber, _viewPosition.column), position)
|
|
: context.convertModelPositionToViewPosition(position)
|
|
);
|
|
return CursorState.fromViewState(cursor.viewState.move(inSelectionMode, viewPosition.lineNumber, viewPosition.column, 0));
|
|
}
|
|
|
|
public static move(context: CursorContext, cursors: CursorState[], args: CursorMove.ParsedArguments): CursorState[] {
|
|
const inSelectionMode = args.select;
|
|
const value = args.value;
|
|
|
|
switch (args.direction) {
|
|
case CursorMove.Direction.Left: {
|
|
if (args.unit === CursorMove.Unit.HalfLine) {
|
|
// Move left by half the current line length
|
|
return this._moveHalfLineLeft(context, cursors, inSelectionMode);
|
|
} else {
|
|
// Move left by `moveParams.value` columns
|
|
return this._moveLeft(context, cursors, inSelectionMode, value);
|
|
}
|
|
}
|
|
case CursorMove.Direction.Right: {
|
|
if (args.unit === CursorMove.Unit.HalfLine) {
|
|
// Move right by half the current line length
|
|
return this._moveHalfLineRight(context, cursors, inSelectionMode);
|
|
} else {
|
|
// Move right by `moveParams.value` columns
|
|
return this._moveRight(context, cursors, inSelectionMode, value);
|
|
}
|
|
}
|
|
case CursorMove.Direction.Up: {
|
|
if (args.unit === CursorMove.Unit.WrappedLine) {
|
|
// Move up by view lines
|
|
return this._moveUpByViewLines(context, cursors, inSelectionMode, value);
|
|
} else {
|
|
// Move up by model lines
|
|
return this._moveUpByModelLines(context, cursors, inSelectionMode, value);
|
|
}
|
|
}
|
|
case CursorMove.Direction.Down: {
|
|
if (args.unit === CursorMove.Unit.WrappedLine) {
|
|
// Move down by view lines
|
|
return this._moveDownByViewLines(context, cursors, inSelectionMode, value);
|
|
} else {
|
|
// Move down by model lines
|
|
return this._moveDownByModelLines(context, cursors, inSelectionMode, value);
|
|
}
|
|
}
|
|
case CursorMove.Direction.WrappedLineStart: {
|
|
// Move to the beginning of the current view line
|
|
return this._moveToViewMinColumn(context, cursors, inSelectionMode);
|
|
}
|
|
case CursorMove.Direction.WrappedLineFirstNonWhitespaceCharacter: {
|
|
// Move to the first non-whitespace column of the current view line
|
|
return this._moveToViewFirstNonWhitespaceColumn(context, cursors, inSelectionMode);
|
|
}
|
|
case CursorMove.Direction.WrappedLineColumnCenter: {
|
|
// Move to the "center" of the current view line
|
|
return this._moveToViewCenterColumn(context, cursors, inSelectionMode);
|
|
}
|
|
case CursorMove.Direction.WrappedLineEnd: {
|
|
// Move to the end of the current view line
|
|
return this._moveToViewMaxColumn(context, cursors, inSelectionMode);
|
|
}
|
|
case CursorMove.Direction.WrappedLineLastNonWhitespaceCharacter: {
|
|
// Move to the last non-whitespace column of the current view line
|
|
return this._moveToViewLastNonWhitespaceColumn(context, cursors, inSelectionMode);
|
|
}
|
|
case CursorMove.Direction.ViewPortTop: {
|
|
// Move to the nth line start in the viewport (from the top)
|
|
const cursor = cursors[0];
|
|
const visibleModelRange = context.getCompletelyVisibleModelRange();
|
|
const modelLineNumber = this._firstLineNumberInRange(context.model, visibleModelRange, value);
|
|
const modelColumn = context.model.getLineFirstNonWhitespaceColumn(modelLineNumber);
|
|
return [this._moveToModelPosition(context, cursor, inSelectionMode, modelLineNumber, modelColumn)];
|
|
}
|
|
case CursorMove.Direction.ViewPortBottom: {
|
|
// Move to the nth line start in the viewport (from the bottom)
|
|
const cursor = cursors[0];
|
|
const visibleModelRange = context.getCompletelyVisibleModelRange();
|
|
const modelLineNumber = this._lastLineNumberInRange(context.model, visibleModelRange, value);
|
|
const modelColumn = context.model.getLineFirstNonWhitespaceColumn(modelLineNumber);
|
|
return [this._moveToModelPosition(context, cursor, inSelectionMode, modelLineNumber, modelColumn)];
|
|
}
|
|
case CursorMove.Direction.ViewPortCenter: {
|
|
// Move to the line start in the viewport center
|
|
const cursor = cursors[0];
|
|
const visibleModelRange = context.getCompletelyVisibleModelRange();
|
|
const modelLineNumber = Math.round((visibleModelRange.startLineNumber + visibleModelRange.endLineNumber) / 2);
|
|
const modelColumn = context.model.getLineFirstNonWhitespaceColumn(modelLineNumber);
|
|
return [this._moveToModelPosition(context, cursor, inSelectionMode, modelLineNumber, modelColumn)];
|
|
}
|
|
case CursorMove.Direction.ViewPortIfOutside: {
|
|
// Move to a position inside the viewport
|
|
const visibleViewRange = context.getCompletelyVisibleViewRange();
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = this.findPositionInViewportIfOutside(context, cursor, visibleViewRange, inSelectionMode);
|
|
}
|
|
return result;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
|
|
public static findPositionInViewportIfOutside(context: CursorContext, cursor: CursorState, visibleViewRange: Range, inSelectionMode: boolean): CursorState {
|
|
let viewLineNumber = cursor.viewState.position.lineNumber;
|
|
|
|
if (visibleViewRange.startLineNumber <= viewLineNumber && viewLineNumber <= visibleViewRange.endLineNumber - 1) {
|
|
// Nothing to do, cursor is in viewport
|
|
return new CursorState(cursor.modelState, cursor.viewState);
|
|
|
|
} else {
|
|
if (viewLineNumber > visibleViewRange.endLineNumber - 1) {
|
|
viewLineNumber = visibleViewRange.endLineNumber - 1;
|
|
}
|
|
if (viewLineNumber < visibleViewRange.startLineNumber) {
|
|
viewLineNumber = visibleViewRange.startLineNumber;
|
|
}
|
|
const viewColumn = context.viewModel.getLineFirstNonWhitespaceColumn(viewLineNumber);
|
|
return this._moveToViewPosition(context, cursor, inSelectionMode, viewLineNumber, viewColumn);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Find the nth line start included in the range (from the start).
|
|
*/
|
|
private static _firstLineNumberInRange(model: ICursorSimpleModel, range: Range, count: number): number {
|
|
let startLineNumber = range.startLineNumber;
|
|
if (range.startColumn !== model.getLineMinColumn(startLineNumber)) {
|
|
// Move on to the second line if the first line start is not included in the range
|
|
startLineNumber++;
|
|
}
|
|
|
|
return Math.min(range.endLineNumber, startLineNumber + count - 1);
|
|
}
|
|
|
|
/**
|
|
* Find the nth line start included in the range (from the end).
|
|
*/
|
|
private static _lastLineNumberInRange(model: ICursorSimpleModel, range: Range, count: number): number {
|
|
let startLineNumber = range.startLineNumber;
|
|
if (range.startColumn !== model.getLineMinColumn(startLineNumber)) {
|
|
// Move on to the second line if the first line start is not included in the range
|
|
startLineNumber++;
|
|
}
|
|
|
|
return Math.max(startLineNumber, range.endLineNumber - count + 1);
|
|
}
|
|
|
|
private static _moveLeft(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean, noOfColumns: number): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
|
|
let newViewState = MoveOperations.moveLeft(context.config, context.viewModel, cursor.viewState, inSelectionMode, noOfColumns);
|
|
|
|
if (noOfColumns === 1 && newViewState.position.lineNumber !== cursor.viewState.position.lineNumber) {
|
|
// moved over to the previous view line
|
|
const newViewModelPosition = context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(newViewState.position);
|
|
if (newViewModelPosition.lineNumber === cursor.modelState.position.lineNumber) {
|
|
// stayed on the same model line => pass wrapping point where 2 view positions map to a single model position
|
|
newViewState = MoveOperations.moveLeft(context.config, context.viewModel, newViewState, inSelectionMode, 1);
|
|
}
|
|
}
|
|
|
|
result[i] = CursorState.fromViewState(newViewState);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveHalfLineLeft(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
const viewLineNumber = cursor.viewState.position.lineNumber;
|
|
const halfLine = Math.round(context.viewModel.getLineContent(viewLineNumber).length / 2);
|
|
result[i] = CursorState.fromViewState(MoveOperations.moveLeft(context.config, context.viewModel, cursor.viewState, inSelectionMode, halfLine));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveRight(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean, noOfColumns: number): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
let newViewState = MoveOperations.moveRight(context.config, context.viewModel, cursor.viewState, inSelectionMode, noOfColumns);
|
|
|
|
if (noOfColumns === 1 && newViewState.position.lineNumber !== cursor.viewState.position.lineNumber) {
|
|
// moved over to the next view line
|
|
const newViewModelPosition = context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(newViewState.position);
|
|
if (newViewModelPosition.lineNumber === cursor.modelState.position.lineNumber) {
|
|
// stayed on the same model line => pass wrapping point where 2 view positions map to a single model position
|
|
newViewState = MoveOperations.moveRight(context.config, context.viewModel, newViewState, inSelectionMode, 1);
|
|
}
|
|
}
|
|
|
|
result[i] = CursorState.fromViewState(newViewState);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveHalfLineRight(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
const viewLineNumber = cursor.viewState.position.lineNumber;
|
|
const halfLine = Math.round(context.viewModel.getLineContent(viewLineNumber).length / 2);
|
|
result[i] = CursorState.fromViewState(MoveOperations.moveRight(context.config, context.viewModel, cursor.viewState, inSelectionMode, halfLine));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveDownByViewLines(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean, linesCount: number): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = CursorState.fromViewState(MoveOperations.moveDown(context.config, context.viewModel, cursor.viewState, inSelectionMode, linesCount));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveDownByModelLines(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean, linesCount: number): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = CursorState.fromModelState(MoveOperations.moveDown(context.config, context.model, cursor.modelState, inSelectionMode, linesCount));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveUpByViewLines(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean, linesCount: number): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = CursorState.fromViewState(MoveOperations.moveUp(context.config, context.viewModel, cursor.viewState, inSelectionMode, linesCount));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveUpByModelLines(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean, linesCount: number): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
result[i] = CursorState.fromModelState(MoveOperations.moveUp(context.config, context.model, cursor.modelState, inSelectionMode, linesCount));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveToViewPosition(context: CursorContext, cursor: CursorState, inSelectionMode: boolean, toViewLineNumber: number, toViewColumn: number): CursorState {
|
|
return CursorState.fromViewState(cursor.viewState.move(inSelectionMode, toViewLineNumber, toViewColumn, 0));
|
|
}
|
|
|
|
private static _moveToModelPosition(context: CursorContext, cursor: CursorState, inSelectionMode: boolean, toModelLineNumber: number, toModelColumn: number): CursorState {
|
|
return CursorState.fromModelState(cursor.modelState.move(inSelectionMode, toModelLineNumber, toModelColumn, 0));
|
|
}
|
|
|
|
private static _moveToViewMinColumn(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
const viewLineNumber = cursor.viewState.position.lineNumber;
|
|
const viewColumn = context.viewModel.getLineMinColumn(viewLineNumber);
|
|
result[i] = this._moveToViewPosition(context, cursor, inSelectionMode, viewLineNumber, viewColumn);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveToViewFirstNonWhitespaceColumn(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
const viewLineNumber = cursor.viewState.position.lineNumber;
|
|
const viewColumn = context.viewModel.getLineFirstNonWhitespaceColumn(viewLineNumber);
|
|
result[i] = this._moveToViewPosition(context, cursor, inSelectionMode, viewLineNumber, viewColumn);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveToViewCenterColumn(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
const viewLineNumber = cursor.viewState.position.lineNumber;
|
|
const viewColumn = Math.round((context.viewModel.getLineMaxColumn(viewLineNumber) + context.viewModel.getLineMinColumn(viewLineNumber)) / 2);
|
|
result[i] = this._moveToViewPosition(context, cursor, inSelectionMode, viewLineNumber, viewColumn);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveToViewMaxColumn(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
const viewLineNumber = cursor.viewState.position.lineNumber;
|
|
const viewColumn = context.viewModel.getLineMaxColumn(viewLineNumber);
|
|
result[i] = this._moveToViewPosition(context, cursor, inSelectionMode, viewLineNumber, viewColumn);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
private static _moveToViewLastNonWhitespaceColumn(context: CursorContext, cursors: CursorState[], inSelectionMode: boolean): CursorState[] {
|
|
let result: CursorState[] = [];
|
|
for (let i = 0, len = cursors.length; i < len; i++) {
|
|
const cursor = cursors[i];
|
|
const viewLineNumber = cursor.viewState.position.lineNumber;
|
|
const viewColumn = context.viewModel.getLineLastNonWhitespaceColumn(viewLineNumber);
|
|
result[i] = this._moveToViewPosition(context, cursor, inSelectionMode, viewLineNumber, viewColumn);
|
|
}
|
|
return result;
|
|
}
|
|
}
|
|
|
|
export namespace CursorMove {
|
|
|
|
const isCursorMoveArgs = function (arg: any): boolean {
|
|
if (!types.isObject(arg)) {
|
|
return false;
|
|
}
|
|
|
|
let cursorMoveArg: RawArguments = arg;
|
|
|
|
if (!types.isString(cursorMoveArg.to)) {
|
|
return false;
|
|
}
|
|
|
|
if (!types.isUndefined(cursorMoveArg.select) && !types.isBoolean(cursorMoveArg.select)) {
|
|
return false;
|
|
}
|
|
|
|
if (!types.isUndefined(cursorMoveArg.by) && !types.isString(cursorMoveArg.by)) {
|
|
return false;
|
|
}
|
|
|
|
if (!types.isUndefined(cursorMoveArg.value) && !types.isNumber(cursorMoveArg.value)) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
};
|
|
|
|
export const description = <ICommandHandlerDescription>{
|
|
description: 'Move cursor to a logical position in the view',
|
|
args: [
|
|
{
|
|
name: 'Cursor move argument object',
|
|
description: `Property-value pairs that can be passed through this argument:
|
|
* 'to': A mandatory logical position value providing where to move the cursor.
|
|
\`\`\`
|
|
'left', 'right', 'up', 'down'
|
|
'wrappedLineStart', 'wrappedLineEnd', 'wrappedLineColumnCenter'
|
|
'wrappedLineFirstNonWhitespaceCharacter', 'wrappedLineLastNonWhitespaceCharacter'
|
|
'viewPortTop', 'viewPortCenter', 'viewPortBottom', 'viewPortIfOutside'
|
|
\`\`\`
|
|
* 'by': Unit to move. Default is computed based on 'to' value.
|
|
\`\`\`
|
|
'line', 'wrappedLine', 'character', 'halfLine'
|
|
\`\`\`
|
|
* 'value': Number of units to move. Default is '1'.
|
|
* 'select': If 'true' makes the selection. Default is 'false'.
|
|
`,
|
|
constraint: isCursorMoveArgs
|
|
}
|
|
]
|
|
};
|
|
|
|
/**
|
|
* Positions in the view for cursor move command.
|
|
*/
|
|
export const RawDirection = {
|
|
Left: 'left',
|
|
Right: 'right',
|
|
Up: 'up',
|
|
Down: 'down',
|
|
|
|
WrappedLineStart: 'wrappedLineStart',
|
|
WrappedLineFirstNonWhitespaceCharacter: 'wrappedLineFirstNonWhitespaceCharacter',
|
|
WrappedLineColumnCenter: 'wrappedLineColumnCenter',
|
|
WrappedLineEnd: 'wrappedLineEnd',
|
|
WrappedLineLastNonWhitespaceCharacter: 'wrappedLineLastNonWhitespaceCharacter',
|
|
|
|
ViewPortTop: 'viewPortTop',
|
|
ViewPortCenter: 'viewPortCenter',
|
|
ViewPortBottom: 'viewPortBottom',
|
|
|
|
ViewPortIfOutside: 'viewPortIfOutside'
|
|
};
|
|
|
|
/**
|
|
* Units for Cursor move 'by' argument
|
|
*/
|
|
export const RawUnit = {
|
|
Line: 'line',
|
|
WrappedLine: 'wrappedLine',
|
|
Character: 'character',
|
|
HalfLine: 'halfLine'
|
|
};
|
|
|
|
/**
|
|
* Arguments for Cursor move command
|
|
*/
|
|
export interface RawArguments {
|
|
to: string;
|
|
select?: boolean;
|
|
by?: string;
|
|
value?: number;
|
|
}
|
|
|
|
export function parse(args: RawArguments): ParsedArguments {
|
|
if (!args.to) {
|
|
// illegal arguments
|
|
return null;
|
|
}
|
|
|
|
let direction: Direction;
|
|
switch (args.to) {
|
|
case RawDirection.Left:
|
|
direction = Direction.Left;
|
|
break;
|
|
case RawDirection.Right:
|
|
direction = Direction.Right;
|
|
break;
|
|
case RawDirection.Up:
|
|
direction = Direction.Up;
|
|
break;
|
|
case RawDirection.Down:
|
|
direction = Direction.Down;
|
|
break;
|
|
case RawDirection.WrappedLineStart:
|
|
direction = Direction.WrappedLineStart;
|
|
break;
|
|
case RawDirection.WrappedLineFirstNonWhitespaceCharacter:
|
|
direction = Direction.WrappedLineFirstNonWhitespaceCharacter;
|
|
break;
|
|
case RawDirection.WrappedLineColumnCenter:
|
|
direction = Direction.WrappedLineColumnCenter;
|
|
break;
|
|
case RawDirection.WrappedLineEnd:
|
|
direction = Direction.WrappedLineEnd;
|
|
break;
|
|
case RawDirection.WrappedLineLastNonWhitespaceCharacter:
|
|
direction = Direction.WrappedLineLastNonWhitespaceCharacter;
|
|
break;
|
|
case RawDirection.ViewPortTop:
|
|
direction = Direction.ViewPortTop;
|
|
break;
|
|
case RawDirection.ViewPortBottom:
|
|
direction = Direction.ViewPortBottom;
|
|
break;
|
|
case RawDirection.ViewPortCenter:
|
|
direction = Direction.ViewPortCenter;
|
|
break;
|
|
case RawDirection.ViewPortIfOutside:
|
|
direction = Direction.ViewPortIfOutside;
|
|
break;
|
|
default:
|
|
// illegal arguments
|
|
return null;
|
|
}
|
|
|
|
let unit = Unit.None;
|
|
switch (args.by) {
|
|
case RawUnit.Line:
|
|
unit = Unit.Line;
|
|
break;
|
|
case RawUnit.WrappedLine:
|
|
unit = Unit.WrappedLine;
|
|
break;
|
|
case RawUnit.Character:
|
|
unit = Unit.Character;
|
|
break;
|
|
case RawUnit.HalfLine:
|
|
unit = Unit.HalfLine;
|
|
break;
|
|
}
|
|
|
|
return {
|
|
direction: direction,
|
|
unit: unit,
|
|
select: (!!args.select),
|
|
value: (args.value || 1)
|
|
};
|
|
}
|
|
|
|
export interface ParsedArguments {
|
|
direction: Direction;
|
|
unit: Unit;
|
|
select: boolean;
|
|
value: number;
|
|
}
|
|
|
|
export const enum Direction {
|
|
Left,
|
|
Right,
|
|
Up,
|
|
Down,
|
|
|
|
WrappedLineStart,
|
|
WrappedLineFirstNonWhitespaceCharacter,
|
|
WrappedLineColumnCenter,
|
|
WrappedLineEnd,
|
|
WrappedLineLastNonWhitespaceCharacter,
|
|
|
|
ViewPortTop,
|
|
ViewPortCenter,
|
|
ViewPortBottom,
|
|
|
|
ViewPortIfOutside,
|
|
}
|
|
|
|
export const enum Unit {
|
|
None,
|
|
Line,
|
|
WrappedLine,
|
|
Character,
|
|
HalfLine,
|
|
}
|
|
|
|
}
|