ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-18 19:11:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

Browse Source 
* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests
This commit is contained in:
Anthony Dresser
2020-01-22 13:42:37 -08:00
committed by GitHub
parent 977111eb21
commit bd7aac8ee0
895 changed files with 24651 additions and 14520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/editor/contrib/linesOperations/copyLinesCommand.ts
View File

@@ -5,10 +5,10 @@
import { Range } from 'vs/editor/common/core/range';
import { Selection, SelectionDirection } from 'vs/editor/common/core/selection';
import * as editorCommon from 'vs/editor/common/editorCommon';
import { ICommand, IEditOperationBuilder, ICursorStateComputerData } from 'vs/editor/common/editorCommon';
import { ITextModel } from 'vs/editor/common/model';
export class CopyLinesCommand implements editorCommon.ICommand {
export class CopyLinesCommand implements ICommand {
private readonly _selection: Selection;
private readonly _isCopyingDown: boolean;
@@ -27,7 +27,7 @@ export class CopyLinesCommand implements editorCommon.ICommand {
this._endLineNumberDelta = 0;
}
public getEditOperations(model: ITextModel, builder: editorCommon.IEditOperationBuilder): void {
public getEditOperations(model: ITextModel, builder: IEditOperationBuilder): void {
let s = this._selection;
this._startLineNumberDelta = 0;
@@ -61,7 +61,7 @@ export class CopyLinesCommand implements editorCommon.ICommand {
this._selectionDirection = this._selection.getDirection();
}
public computeCursorState(model: ITextModel, helper: editorCommon.ICursorStateComputerData): Selection {
public computeCursorState(model: ITextModel, helper: ICursorStateComputerData): Selection {
let result = helper.getTrackedSelection(this._selectionId!);
if (this._startLineNumberDelta !== 0 || this._endLineNumberDelta !== 0) {

8
src/vs/editor/contrib/linesOperations/sortLinesCommand.ts
View File

@@ -6,10 +6,10 @@
import { EditOperation } from 'vs/editor/common/core/editOperation';
import { Range } from 'vs/editor/common/core/range';
import { Selection } from 'vs/editor/common/core/selection';
import * as editorCommon from 'vs/editor/common/editorCommon';
import { ICommand, IEditOperationBuilder, ICursorStateComputerData } from 'vs/editor/common/editorCommon';
import { IIdentifiedSingleEditOperation, ITextModel } from 'vs/editor/common/model';
export class SortLinesCommand implements editorCommon.ICommand {
export class SortLinesCommand implements ICommand {
private static _COLLATOR: Intl.Collator | null = null;
public static getCollator(): Intl.Collator {
@@ -29,7 +29,7 @@ export class SortLinesCommand implements editorCommon.ICommand {
this.selectionId = null;
}
public getEditOperations(model: ITextModel, builder: editorCommon.IEditOperationBuilder): void {
public getEditOperations(model: ITextModel, builder: IEditOperationBuilder): void {
let op = sortLines(model, this.selection, this.descending);
if (op) {
builder.addEditOperation(op.range, op.text);
@@ -38,7 +38,7 @@ export class SortLinesCommand implements editorCommon.ICommand {
this.selectionId = builder.trackSelection(this.selection);
}
public computeCursorState(model: ITextModel, helper: editorCommon.ICursorStateComputerData): Selection {
public computeCursorState(model: ITextModel, helper: ICursorStateComputerData): Selection {
return helper.getTrackedSelection(this.selectionId!);
}

304
src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
View File

@@ -12,6 +12,19 @@ import { ITextModel } from 'vs/editor/common/model';
import { TitleCaseAction, DeleteAllLeftAction, DeleteAllRightAction, IndentLinesAction, InsertLineAfterAction, InsertLineBeforeAction, JoinLinesAction, LowerCaseAction, SortLinesAscendingAction, SortLinesDescendingAction, TransposeAction, UpperCaseAction, DeleteLinesAction } from 'vs/editor/contrib/linesOperations/linesOperations';
import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
import type { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { EditorAction } from 'vs/editor/browser/editorExtensions';
function assertSelection(editor: ICodeEditor, expected: Selection | Selection[]): void {
if (!Array.isArray(expected)) {
expected = [expected];
}
assert.deepEqual(editor.getSelections(), expected);
}
function executeAction(action: EditorAction, editor: ICodeEditor): void {
action.run(null!, editor, undefined);
}
suite('Editor Contrib - Line Operations', () => {
suite('SortLinesAscendingAction', () => {
@@ -26,13 +39,13 @@ suite('Editor Contrib - Line Operations', () => {
let sortLinesAscendingAction = new SortLinesAscendingAction();
editor.setSelection(new Selection(1, 1, 3, 5));
sortLinesAscendingAction.run(null!, editor);
executeAction(sortLinesAscendingAction, editor);
assert.deepEqual(model.getLinesContent(), [
'alpha',
'beta',
'omicron'
]);
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 1, 3, 7).toString());
assertSelection(editor, new Selection(1, 1, 3, 7));
});
});
@@ -51,7 +64,7 @@ suite('Editor Contrib - Line Operations', () => {
let sortLinesAscendingAction = new SortLinesAscendingAction();
editor.setSelections([new Selection(1, 1, 3, 5), new Selection(5, 1, 7, 5)]);
sortLinesAscendingAction.run(null!, editor);
executeAction(sortLinesAscendingAction, editor);
assert.deepEqual(model.getLinesContent(), [
'alpha',
'beta',
@@ -84,13 +97,13 @@ suite('Editor Contrib - Line Operations', () => {
let sortLinesDescendingAction = new SortLinesDescendingAction();
editor.setSelection(new Selection(1, 1, 3, 7));
sortLinesDescendingAction.run(null!, editor);
executeAction(sortLinesDescendingAction, editor);
assert.deepEqual(model.getLinesContent(), [
'omicron',
'beta',
'alpha'
]);
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 1, 3, 5).toString());
assertSelection(editor, new Selection(1, 1, 3, 5));
});
});
@@ -109,7 +122,7 @@ suite('Editor Contrib - Line Operations', () => {
let sortLinesDescendingAction = new SortLinesDescendingAction();
editor.setSelections([new Selection(1, 1, 3, 7), new Selection(5, 1, 7, 7)]);
sortLinesDescendingAction.run(null!, editor);
executeAction(sortLinesDescendingAction, editor);
assert.deepEqual(model.getLinesContent(), [
'omicron',
'beta',
@@ -143,13 +156,13 @@ suite('Editor Contrib - Line Operations', () => {
let deleteAllLeftAction = new DeleteAllLeftAction();
editor.setSelection(new Selection(1, 2, 1, 2));
deleteAllLeftAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'ne', '001');
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(1), 'ne');
editor.setSelections([new Selection(2, 2, 2, 2), new Selection(3, 2, 3, 2)]);
deleteAllLeftAction.run(null!, editor);
assert.equal(model.getLineContent(2), 'wo', '002');
assert.equal(model.getLineContent(3), 'hree', '003');
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(2), 'wo');
assert.equal(model.getLineContent(3), 'hree');
});
});
@@ -164,16 +177,16 @@ suite('Editor Contrib - Line Operations', () => {
let deleteAllLeftAction = new DeleteAllLeftAction();
editor.setSelection(new Selection(2, 1, 2, 1));
deleteAllLeftAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'onetwo', '001');
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(1), 'onetwo');
editor.setSelections([new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1)]);
deleteAllLeftAction.run(null!, editor);
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLinesContent()[0], 'onetwothree');
assert.equal(model.getLinesContent().length, 1);
editor.setSelection(new Selection(1, 1, 1, 1));
deleteAllLeftAction.run(null!, editor);
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLinesContent()[0], 'onetwothree');
});
});
@@ -197,7 +210,7 @@ suite('Editor Contrib - Line Operations', () => {
editor.setSelections([beforeSecondWasoSelection, endOfBCCSelection, endOfNonono]);
deleteAllLeftAction.run(null!, editor);
executeAction(deleteAllLeftAction, editor);
let selections = editor.getSelections()!;
assert.equal(model.getLineContent(2), '');
@@ -225,7 +238,7 @@ suite('Editor Contrib - Line Operations', () => {
selections[2].endColumn
], [5, 1, 5, 1]);
deleteAllLeftAction.run(null!, editor);
executeAction(deleteAllLeftAction, editor);
selections = editor.getSelections()!;
assert.equal(model.getLineContent(1), 'hi my name is Carlos Matos waso waso');
@@ -263,24 +276,24 @@ suite('Editor Contrib - Line Operations', () => {
let deleteAllLeftAction = new DeleteAllLeftAction();
editor.setSelections([new Selection(1, 2, 1, 2), new Selection(1, 4, 1, 4)]);
deleteAllLeftAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'lo', '001');
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(1), 'lo');
editor.setSelections([new Selection(2, 2, 2, 2), new Selection(2, 4, 2, 5)]);
deleteAllLeftAction.run(null!, editor);
assert.equal(model.getLineContent(2), 'd', '002');
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(2), 'd');
editor.setSelections([new Selection(3, 2, 3, 5), new Selection(3, 7, 3, 7)]);
deleteAllLeftAction.run(null!, editor);
assert.equal(model.getLineContent(3), 'world', '003');
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(3), 'world');
editor.setSelections([new Selection(4, 3, 4, 3), new Selection(4, 5, 5, 4)]);
deleteAllLeftAction.run(null!, editor);
assert.equal(model.getLineContent(4), 'jour', '004');
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(4), 'jour');
editor.setSelections([new Selection(5, 3, 6, 3), new Selection(6, 5, 7, 5), new Selection(7, 7, 7, 7)]);
deleteAllLeftAction.run(null!, editor);
assert.equal(model.getLineContent(5), 'world', '005');
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(5), 'world');
});
});
@@ -300,7 +313,7 @@ suite('Editor Contrib - Line Operations', () => {
assert.equal(model.getLineContent(1), 'Typing some text here on line one');
assert.deepEqual(editor.getSelection(), new Selection(1, 31, 1, 31));
deleteAllLeftAction.run(null!, editor);
executeAction(deleteAllLeftAction, editor);
assert.equal(model.getLineContent(1), 'one');
assert.deepEqual(editor.getSelection(), new Selection(1, 1, 1, 1));
@@ -331,29 +344,29 @@ suite('Editor Contrib - Line Operations', () => {
let joinLinesAction = new JoinLinesAction();
editor.setSelection(new Selection(1, 2, 1, 2));
joinLinesAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'hello world', '001');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 6, 1, 6).toString(), '002');
executeAction(joinLinesAction, editor);
assert.equal(model.getLineContent(1), 'hello world');
assertSelection(editor, new Selection(1, 6, 1, 6));
editor.setSelection(new Selection(2, 2, 2, 2));
joinLinesAction.run(null!, editor);
assert.equal(model.getLineContent(2), 'hello world', '003');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 7, 2, 7).toString(), '004');
executeAction(joinLinesAction, editor);
assert.equal(model.getLineContent(2), 'hello world');
assertSelection(editor, new Selection(2, 7, 2, 7));
editor.setSelection(new Selection(3, 2, 3, 2));
joinLinesAction.run(null!, editor);
assert.equal(model.getLineContent(3), 'hello world', '005');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(3, 7, 3, 7).toString(), '006');
executeAction(joinLinesAction, editor);
assert.equal(model.getLineContent(3), 'hello world');
assertSelection(editor, new Selection(3, 7, 3, 7));
editor.setSelection(new Selection(4, 2, 5, 3));
joinLinesAction.run(null!, editor);
assert.equal(model.getLineContent(4), 'hello world', '007');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(4, 2, 4, 8).toString(), '008');
executeAction(joinLinesAction, editor);
assert.equal(model.getLineContent(4), 'hello world');
assertSelection(editor, new Selection(4, 2, 4, 8));
editor.setSelection(new Selection(5, 1, 7, 3));
joinLinesAction.run(null!, editor);
assert.equal(model.getLineContent(5), 'hello world', '009');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(5, 1, 5, 3).toString(), '010');
executeAction(joinLinesAction, editor);
assert.equal(model.getLineContent(5), 'hello world');
assertSelection(editor, new Selection(5, 1, 5, 3));
});
});
@@ -367,10 +380,10 @@ suite('Editor Contrib - Line Operations', () => {
let joinLinesAction = new JoinLinesAction();
editor.setSelection(new Selection(2, 1, 2, 1));
joinLinesAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'hello', '001');
assert.equal(model.getLineContent(2), 'world', '002');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 6, 2, 6).toString(), '003');
executeAction(joinLinesAction, editor);
assert.equal(model.getLineContent(1), 'hello');
assert.equal(model.getLineContent(2), 'world');
assertSelection(editor, new Selection(2, 6, 2, 6));
});
});
@@ -402,19 +415,16 @@ suite('Editor Contrib - Line Operations', () => {
new Selection(10, 1, 10, 1)
]);
joinLinesAction.run(null!, editor);
assert.equal(model.getLinesContent().join('\n'), 'hello world\nhello world\nhello world\nhello world\n\nhello world', '001');
assert.deepEqual(editor.getSelections()!.toString(), [
executeAction(joinLinesAction, editor);
assert.equal(model.getLinesContent().join('\n'), 'hello world\nhello world\nhello world\nhello world\n\nhello world');
assertSelection(editor, [
/** primary cursor */
new Selection(3, 4, 3, 8),
new Selection(1, 6, 1, 6),
new Selection(2, 2, 2, 8),
new Selection(4, 5, 4, 9),
new Selection(6, 1, 6, 1)
].toString(), '002');
/** primary cursor */
assert.deepEqual(editor.getSelection()!.toString(), new Selection(3, 4, 3, 8).toString(), '003');
]);
});
});
@@ -433,7 +443,7 @@ suite('Editor Contrib - Line Operations', () => {
assert.equal(model.getLineContent(1), 'hello my dear');
assert.deepEqual(editor.getSelection(), new Selection(1, 14, 1, 14));
joinLinesAction.run(null!, editor);
executeAction(joinLinesAction, editor);
assert.equal(model.getLineContent(1), 'hello my dear world');
assert.deepEqual(editor.getSelection(), new Selection(1, 14, 1, 14));
@@ -456,29 +466,29 @@ suite('Editor Contrib - Line Operations', () => {
let transposeAction = new TransposeAction();
editor.setSelection(new Selection(1, 1, 1, 1));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'hello world', '001');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 2, 1, 2).toString(), '002');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(1), 'hello world');
assertSelection(editor, new Selection(1, 2, 1, 2));
editor.setSelection(new Selection(1, 6, 1, 6));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'hell oworld', '003');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 7, 1, 7).toString(), '004');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(1), 'hell oworld');
assertSelection(editor, new Selection(1, 7, 1, 7));
editor.setSelection(new Selection(1, 12, 1, 12));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'hell oworl', '005');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 2, 2, 2).toString(), '006');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(1), 'hell oworl');
assertSelection(editor, new Selection(2, 2, 2, 2));
editor.setSelection(new Selection(3, 1, 3, 1));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(3), '', '007');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(4, 1, 4, 1).toString(), '008');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(3), '');
assertSelection(editor, new Selection(4, 1, 4, 1));
editor.setSelection(new Selection(4, 2, 4, 2));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(4), ' ', '009');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(4, 3, 4, 3).toString(), '010');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(4), ' ');
assertSelection(editor, new Selection(4, 3, 4, 3));
}
);
@@ -498,24 +508,24 @@ suite('Editor Contrib - Line Operations', () => {
let transposeAction = new TransposeAction();
editor.setSelection(new Selection(1, 1, 1, 1));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(2), '', '011');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 1, 2, 1).toString(), '012');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(2), '');
assertSelection(editor, new Selection(2, 1, 2, 1));
editor.setSelection(new Selection(3, 6, 3, 6));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(4), 'oworld', '013');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(4, 2, 4, 2).toString(), '014');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(4), 'oworld');
assertSelection(editor, new Selection(4, 2, 4, 2));
editor.setSelection(new Selection(6, 12, 6, 12));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(7), 'd', '015');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(7, 2, 7, 2).toString(), '016');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(7), 'd');
assertSelection(editor, new Selection(7, 2, 7, 2));
editor.setSelection(new Selection(8, 12, 8, 12));
transposeAction.run(null!, editor);
assert.equal(model.getLineContent(8), 'hello world', '019');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(8, 12, 8, 12).toString(), '020');
executeAction(transposeAction, editor);
assert.equal(model.getLineContent(8), 'hello world');
assertSelection(editor, new Selection(8, 12, 8, 12));
}
);
});
@@ -532,44 +542,44 @@ suite('Editor Contrib - Line Operations', () => {
let titlecaseAction = new TitleCaseAction();
editor.setSelection(new Selection(1, 1, 1, 12));
uppercaseAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'HELLO WORLD', '001');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 1, 1, 12).toString(), '002');
executeAction(uppercaseAction, editor);
assert.equal(model.getLineContent(1), 'HELLO WORLD');
assertSelection(editor, new Selection(1, 1, 1, 12));
editor.setSelection(new Selection(1, 1, 1, 12));
lowercaseAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'hello world', '003');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 1, 1, 12).toString(), '004');
executeAction(lowercaseAction, editor);
assert.equal(model.getLineContent(1), 'hello world');
assertSelection(editor, new Selection(1, 1, 1, 12));
editor.setSelection(new Selection(1, 3, 1, 3));
uppercaseAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'HELLO world', '005');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 3, 1, 3).toString(), '006');
executeAction(uppercaseAction, editor);
assert.equal(model.getLineContent(1), 'HELLO world');
assertSelection(editor, new Selection(1, 3, 1, 3));
editor.setSelection(new Selection(1, 4, 1, 4));
lowercaseAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'hello world', '007');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 4, 1, 4).toString(), '008');
executeAction(lowercaseAction, editor);
assert.equal(model.getLineContent(1), 'hello world');
assertSelection(editor, new Selection(1, 4, 1, 4));
editor.setSelection(new Selection(1, 1, 1, 12));
titlecaseAction.run(null!, editor);
assert.equal(model.getLineContent(1), 'Hello World', '009');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 1, 1, 12).toString(), '010');
executeAction(titlecaseAction, editor);
assert.equal(model.getLineContent(1), 'Hello World');
assertSelection(editor, new Selection(1, 1, 1, 12));
editor.setSelection(new Selection(2, 1, 2, 6));
uppercaseAction.run(null!, editor);
assert.equal(model.getLineContent(2), 'ÖÇŞĞÜ', '011');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 1, 2, 6).toString(), '012');
executeAction(uppercaseAction, editor);
assert.equal(model.getLineContent(2), 'ÖÇŞĞÜ');
assertSelection(editor, new Selection(2, 1, 2, 6));
editor.setSelection(new Selection(2, 1, 2, 6));
lowercaseAction.run(null!, editor);
assert.equal(model.getLineContent(2), 'öçşğü', '013');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 1, 2, 6).toString(), '014');
executeAction(lowercaseAction, editor);
assert.equal(model.getLineContent(2), 'öçşğü');
assertSelection(editor, new Selection(2, 1, 2, 6));
editor.setSelection(new Selection(2, 1, 2, 6));
titlecaseAction.run(null!, editor);
assert.equal(model.getLineContent(2), 'Öçşğü', '015');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 1, 2, 6).toString(), '016');
executeAction(titlecaseAction, editor);
assert.equal(model.getLineContent(2), 'Öçşğü');
assertSelection(editor, new Selection(2, 1, 2, 6));
}
);
@@ -586,27 +596,27 @@ suite('Editor Contrib - Line Operations', () => {
let titlecaseAction = new TitleCaseAction();
editor.setSelection(new Selection(1, 1, 1, 12));
titlecaseAction.run(null!, editor);
executeAction(titlecaseAction, editor);
assert.equal(model.getLineContent(1), 'Foo Bar Baz');
editor.setSelection(new Selection(2, 1, 2, 12));
titlecaseAction.run(null!, editor);
executeAction(titlecaseAction, editor);
assert.equal(model.getLineContent(2), 'Foo\'Bar\'Baz');
editor.setSelection(new Selection(3, 1, 3, 12));
titlecaseAction.run(null!, editor);
executeAction(titlecaseAction, editor);
assert.equal(model.getLineContent(3), 'Foo[Bar]Baz');
editor.setSelection(new Selection(4, 1, 4, 12));
titlecaseAction.run(null!, editor);
executeAction(titlecaseAction, editor);
assert.equal(model.getLineContent(4), 'Foo`Bar~Baz');
editor.setSelection(new Selection(5, 1, 5, 12));
titlecaseAction.run(null!, editor);
executeAction(titlecaseAction, editor);
assert.equal(model.getLineContent(5), 'Foo^Bar%Baz');
editor.setSelection(new Selection(6, 1, 6, 12));
titlecaseAction.run(null!, editor);
executeAction(titlecaseAction, editor);
assert.equal(model.getLineContent(6), 'Foo$Bar!Baz');
}
);
@@ -621,24 +631,24 @@ suite('Editor Contrib - Line Operations', () => {
let lowercaseAction = new LowerCaseAction();
editor.setSelection(new Selection(1, 1, 1, 1));
uppercaseAction.run(null!, editor);
assert.equal(model.getLineContent(1), '', '013');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 1, 1, 1).toString(), '014');
executeAction(uppercaseAction, editor);
assert.equal(model.getLineContent(1), '');
assertSelection(editor, new Selection(1, 1, 1, 1));
editor.setSelection(new Selection(1, 1, 1, 1));
lowercaseAction.run(null!, editor);
assert.equal(model.getLineContent(1), '', '015');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(1, 1, 1, 1).toString(), '016');
executeAction(lowercaseAction, editor);
assert.equal(model.getLineContent(1), '');
assertSelection(editor, new Selection(1, 1, 1, 1));
editor.setSelection(new Selection(2, 2, 2, 2));
uppercaseAction.run(null!, editor);
assert.equal(model.getLineContent(2), ' ', '017');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 2, 2, 2).toString(), '018');
executeAction(uppercaseAction, editor);
assert.equal(model.getLineContent(2), ' ');
assertSelection(editor, new Selection(2, 2, 2, 2));
editor.setSelection(new Selection(2, 2, 2, 2));
lowercaseAction.run(null!, editor);
assert.equal(model.getLineContent(2), ' ', '019');
assert.deepEqual(editor.getSelection()!.toString(), new Selection(2, 2, 2, 2).toString(), '020');
executeAction(lowercaseAction, editor);
assert.equal(model.getLineContent(2), ' ');
assertSelection(editor, new Selection(2, 2, 2, 2));
}
);
});
@@ -649,17 +659,17 @@ suite('Editor Contrib - Line Operations', () => {
const model = editor.getModel()!;
const action = new DeleteAllRightAction();
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
editor.setSelection(new Selection(1, 1, 1, 1));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
editor.setSelections([new Selection(1, 1, 1, 1), new Selection(1, 1, 1, 1), new Selection(1, 1, 1, 1)]);
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
});
@@ -674,17 +684,17 @@ suite('Editor Contrib - Line Operations', () => {
const action = new DeleteAllRightAction();
editor.setSelection(new Selection(1, 2, 1, 5));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['ho', 'world']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 2, 1, 2)]);
editor.setSelection(new Selection(1, 1, 2, 4));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['ld']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
editor.setSelection(new Selection(1, 1, 1, 3));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
});
@@ -699,12 +709,12 @@ suite('Editor Contrib - Line Operations', () => {
const action = new DeleteAllRightAction();
editor.setSelection(new Selection(1, 3, 1, 3));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['he', 'world']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 3, 1, 3)]);
editor.setSelection(new Selection(2, 1, 2, 1));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['he', '']);
assert.deepEqual(editor.getSelections(), [new Selection(2, 1, 2, 1)]);
});
@@ -719,17 +729,17 @@ suite('Editor Contrib - Line Operations', () => {
const action = new DeleteAllRightAction();
editor.setSelection(new Selection(1, 6, 1, 6));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['helloworld']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
editor.setSelection(new Selection(1, 6, 1, 6));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['hello']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
editor.setSelection(new Selection(1, 6, 1, 6));
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['hello']);
assert.deepEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
});
@@ -749,34 +759,34 @@ suite('Editor Contrib - Line Operations', () => {
new Selection(1, 6, 1, 6),
new Selection(3, 4, 3, 4),
]);
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['hethere', 'wor']);
assert.deepEqual(editor.getSelections(), [
new Selection(1, 3, 1, 3),
new Selection(2, 4, 2, 4)
]);
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['he', 'wor']);
assert.deepEqual(editor.getSelections(), [
new Selection(1, 3, 1, 3),
new Selection(2, 4, 2, 4)
]);
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['hewor']);
assert.deepEqual(editor.getSelections(), [
new Selection(1, 3, 1, 3),
new Selection(1, 6, 1, 6)
]);
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['he']);
assert.deepEqual(editor.getSelections(), [
new Selection(1, 3, 1, 3)
]);
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['he']);
assert.deepEqual(editor.getSelections(), [
new Selection(1, 3, 1, 3)
@@ -798,7 +808,7 @@ suite('Editor Contrib - Line Operations', () => {
new Selection(1, 6, 1, 6),
new Selection(3, 4, 3, 4),
]);
action.run(null!, editor);
executeAction(action, editor);
assert.deepEqual(model.getLinesContent(), ['hethere', 'wor']);
assert.deepEqual(editor.getSelections(), [
new Selection(1, 3, 1, 3),
@@ -831,7 +841,7 @@ suite('Editor Contrib - Line Operations', () => {
editor.setPosition(new Position(lineNumber, column));
let insertLineBeforeAction = new InsertLineBeforeAction();
insertLineBeforeAction.run(null!, editor);
executeAction(insertLineBeforeAction, editor);
callback(editor.getModel()!, cursor);
});
}
@@ -872,7 +882,7 @@ suite('Editor Contrib - Line Operations', () => {
editor.setPosition(new Position(lineNumber, column));
let insertLineAfterAction = new InsertLineAfterAction();
insertLineAfterAction.run(null!, editor);
executeAction(insertLineAfterAction, editor);
callback(editor.getModel()!, cursor);
});
}
@@ -917,7 +927,7 @@ suite('Editor Contrib - Line Operations', () => {
let indentLinesAction = new IndentLinesAction();
editor.setPosition(new Position(1, 2));
indentLinesAction.run(null!, editor);
executeAction(indentLinesAction, editor);
assert.equal(model.getLineContent(1), '\tfunction baz() {');
assert.deepEqual(editor.getSelection(), new Selection(1, 3, 1, 3));
@@ -942,7 +952,7 @@ suite('Editor Contrib - Line Operations', () => {
const indentLinesAction = new IndentLinesAction();
editor.setPosition(new Position(1, 1));
indentLinesAction.run(null!, editor);
executeAction(indentLinesAction, editor);
assert.equal(model.getLineContent(1), '\tSome text');
assert.deepEqual(editor.getSelection(), new Selection(1, 2, 1, 2));
});
@@ -964,7 +974,7 @@ suite('Editor Contrib - Line Operations', () => {
new Selection(3, 4, 3, 4),
]);
const deleteLinesAction = new DeleteLinesAction();
deleteLinesAction.run(null!, editor);
executeAction(deleteLinesAction, editor);
assert.equal(editor.getValue(), 'a\nc');
});
@@ -976,7 +986,7 @@ suite('Editor Contrib - Line Operations', () => {
withTestCodeEditor(initialText, {}, (editor) => {
editor.setSelections(initialSelections);
const deleteLinesAction = new DeleteLinesAction();
deleteLinesAction.run(null!, editor);
executeAction(deleteLinesAction, editor);
assert.equal(editor.getValue(), resultingText.join('\n'));
assert.deepEqual(editor.getSelections(), resultingSelections);