mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-11 10:38:31 -05:00
Initial VS Code 1.19 source merge (#571)
* Initial 1.19 xcopy * Fix yarn build * Fix numerous build breaks * Next batch of build break fixes * More build break fixes * Runtime breaks * Additional post merge fixes * Fix windows setup file * Fix test failures. * Update license header blocks to refer to source eula
This commit is contained in:
@@ -0,0 +1,106 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* 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 * as assert from 'assert';
|
||||
import { TrimTrailingWhitespaceCommand, trimTrailingWhitespace } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand';
|
||||
import { Selection } from 'vs/editor/common/core/selection';
|
||||
import { Position } from 'vs/editor/common/core/position';
|
||||
import { Range } from 'vs/editor/common/core/range';
|
||||
import { IIdentifiedSingleEditOperation } from 'vs/editor/common/editorCommon';
|
||||
import { getEditOperation } from 'vs/editor/test/browser/testCommand';
|
||||
import { withEditorModel } from 'vs/editor/test/common/editorTestUtils';
|
||||
|
||||
/**
|
||||
* Create single edit operation
|
||||
*/
|
||||
function createInsertDeleteSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): IIdentifiedSingleEditOperation {
|
||||
return {
|
||||
identifier: null,
|
||||
range: new Range(selectionLineNumber, selectionColumn, positionLineNumber, positionColumn),
|
||||
text: text,
|
||||
forceMoveMarkers: true
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Create single edit operation
|
||||
*/
|
||||
export function createSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): IIdentifiedSingleEditOperation {
|
||||
return {
|
||||
identifier: null,
|
||||
range: new Range(selectionLineNumber, selectionColumn, positionLineNumber, positionColumn),
|
||||
text: text,
|
||||
forceMoveMarkers: false
|
||||
};
|
||||
}
|
||||
|
||||
function assertTrimTrailingWhitespaceCommand(text: string[], expected: IIdentifiedSingleEditOperation[]): void {
|
||||
return withEditorModel(text, (model) => {
|
||||
var op = new TrimTrailingWhitespaceCommand(new Selection(1, 1, 1, 1), []);
|
||||
var actual = getEditOperation(model, op);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
}
|
||||
|
||||
function assertTrimTrailingWhitespace(text: string[], cursors: Position[], expected: IIdentifiedSingleEditOperation[]): void {
|
||||
return withEditorModel(text, (model) => {
|
||||
var actual = trimTrailingWhitespace(model, cursors);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
}
|
||||
|
||||
suite('Editor Commands - Trim Trailing Whitespace Command', () => {
|
||||
|
||||
test('remove trailing whitespace', function () {
|
||||
assertTrimTrailingWhitespaceCommand([''], []);
|
||||
assertTrimTrailingWhitespaceCommand(['text'], []);
|
||||
assertTrimTrailingWhitespaceCommand(['text '], [createSingleEditOp(null, 1, 5, 1, 8)]);
|
||||
assertTrimTrailingWhitespaceCommand(['text\t '], [createSingleEditOp(null, 1, 5, 1, 9)]);
|
||||
assertTrimTrailingWhitespaceCommand(['\t '], [createSingleEditOp(null, 1, 1, 1, 5)]);
|
||||
assertTrimTrailingWhitespaceCommand(['text\t'], [createSingleEditOp(null, 1, 5, 1, 6)]);
|
||||
assertTrimTrailingWhitespaceCommand([
|
||||
'some text\t',
|
||||
'some more text',
|
||||
'\t ',
|
||||
'even more text ',
|
||||
'and some mixed\t \t'
|
||||
], [
|
||||
createSingleEditOp(null, 1, 10, 1, 11),
|
||||
createSingleEditOp(null, 3, 1, 3, 4),
|
||||
createSingleEditOp(null, 4, 15, 4, 17),
|
||||
createSingleEditOp(null, 5, 15, 5, 20)
|
||||
]);
|
||||
|
||||
|
||||
assertTrimTrailingWhitespace(['text '], [new Position(1, 1), new Position(1, 2), new Position(1, 3)], [createInsertDeleteSingleEditOp(null, 1, 5, 1, 8)]);
|
||||
assertTrimTrailingWhitespace(['text '], [new Position(1, 1), new Position(1, 5)], [createInsertDeleteSingleEditOp(null, 1, 5, 1, 8)]);
|
||||
assertTrimTrailingWhitespace(['text '], [new Position(1, 1), new Position(1, 5), new Position(1, 6)], [createInsertDeleteSingleEditOp(null, 1, 6, 1, 8)]);
|
||||
assertTrimTrailingWhitespace([
|
||||
'some text\t',
|
||||
'some more text',
|
||||
'\t ',
|
||||
'even more text ',
|
||||
'and some mixed\t \t'
|
||||
], [], [
|
||||
createInsertDeleteSingleEditOp(null, 1, 10, 1, 11),
|
||||
createInsertDeleteSingleEditOp(null, 3, 1, 3, 4),
|
||||
createInsertDeleteSingleEditOp(null, 4, 15, 4, 17),
|
||||
createInsertDeleteSingleEditOp(null, 5, 15, 5, 20)
|
||||
]);
|
||||
assertTrimTrailingWhitespace([
|
||||
'some text\t',
|
||||
'some more text',
|
||||
'\t ',
|
||||
'even more text ',
|
||||
'and some mixed\t \t'
|
||||
], [new Position(1, 11), new Position(3, 2), new Position(5, 1), new Position(4, 1), new Position(5, 10)], [
|
||||
createInsertDeleteSingleEditOp(null, 3, 2, 3, 4),
|
||||
createInsertDeleteSingleEditOp(null, 4, 15, 4, 17),
|
||||
createInsertDeleteSingleEditOp(null, 5, 15, 5, 20)
|
||||
]);
|
||||
});
|
||||
|
||||
});
|
||||
Reference in New Issue
Block a user