ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 01:32:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)

Browse Source 
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8

* Bump distro

* Upgrade GCC to 4.9 due to yarn install errors

* Update build image

* Fix bootstrap base url

* Bump distro

* Fix build errors

* Update source map file

* Disable checkbox for blocking migration issues (#15131)

* disable checkbox for blocking issues

* wip

* disable checkbox fixes

* fix strings

* Remove duplicate tsec command

* Default to off for tab color if settings not present

* re-skip failing tests

* Fix mocha error

* Bump sqlite version & fix notebooks search view

* Turn off esbuild warnings

* Update esbuild log level

* Fix overflowactionbar tests

* Fix ts-ignore in dropdown tests

* cleanup/fixes

* Fix hygiene

* Bundle in entire zone.js module

* Remove extra constructor param

* bump distro for web compile break

* bump distro for web compile break v2

* Undo log level change

* New distro

* Fix integration test scripts

* remove the "no yarn.lock changes" workflow

* fix scripts v2

* Update unit test scripts

* Ensure ads-kerberos2 updates in .vscodeignore

* Try fix unit tests

* Upload crash reports

* remove nogpu

* always upload crashes

* Use bash script

* Consolidate data/ext dir names

* Create in tmp directory

Co-authored-by: chlafreniere <hichise@gmail.com>
Co-authored-by: Christopher Suh <chsuh@microsoft.com>
Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
Karl Burtram
2021-04-27 14:01:59 -07:00
committed by GitHub
parent 7e1c0076ba
commit 867a963882
1817 changed files with 81812 additions and 50843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
View File

@@ -18,7 +18,7 @@ suite('ViewModel', () => {
lineNumbersMinChars: 1
};
testViewModel(text, opts, (viewModel, model) => {
assert.equal(viewModel.getLineCount(), 1);
assert.strictEqual(viewModel.getLineCount(), 1);
viewModel.setViewport(1, 1, 1);
@@ -38,14 +38,14 @@ suite('ViewModel', () => {
].join('\n')
}]);
assert.equal(viewModel.getLineCount(), 10);
assert.strictEqual(viewModel.getLineCount(), 10);
});
});
test('issue #44805: SplitLinesCollection: attempt to access a \'newer\' model', () => {
const text = [''];
testViewModel(text, {}, (viewModel, model) => {
assert.equal(viewModel.getLineCount(), 1);
assert.strictEqual(viewModel.getLineCount(), 1);
model.pushEditOperations([], [{
range: new Range(1, 1, 1, 1),
@@ -74,7 +74,7 @@ suite('ViewModel', () => {
model.undo();
viewLineCount.push(viewModel.getLineCount());
assert.deepEqual(viewLineCount, [4, 1, 1, 1, 1]);
assert.deepStrictEqual(viewLineCount, [4, 1, 1, 1, 1]);
});
});
@@ -85,7 +85,7 @@ suite('ViewModel', () => {
'line3'
];
testViewModel(text, {}, (viewModel, model) => {
assert.equal(viewModel.getLineCount(), 3);
assert.strictEqual(viewModel.getLineCount(), 3);
viewModel.setHiddenAreas([new Range(1, 1, 3, 1)]);
assert.ok(viewModel.getVisibleRanges() !== null);
});
@@ -96,7 +96,7 @@ suite('ViewModel', () => {
''
];
testViewModel(text, {}, (viewModel, model) => {
assert.equal(viewModel.getLineCount(), 1);
assert.strictEqual(viewModel.getLineCount(), 1);
model.pushEditOperations([], [{
range: new Range(1, 1, 1, 1),
@@ -104,7 +104,7 @@ suite('ViewModel', () => {
}], () => ([]));
viewModel.setHiddenAreas([new Range(1, 1, 1, 1)]);
assert.equal(viewModel.getLineCount(), 2);
assert.strictEqual(viewModel.getLineCount(), 2);
model.undo();
assert.ok(viewModel.getVisibleRanges() !== null);
@@ -114,7 +114,7 @@ suite('ViewModel', () => {
function assertGetPlainTextToCopy(text: string[], ranges: Range[], emptySelectionClipboard: boolean, expected: string | string[]): void {
testViewModel(text, {}, (viewModel, model) => {
let actual = viewModel.getPlainTextToCopy(ranges, emptySelectionClipboard, false);
assert.deepEqual(actual, expected);
assert.deepStrictEqual(actual, expected);
});
}
@@ -259,7 +259,39 @@ suite('ViewModel', () => {
testViewModel(USUAL_TEXT, {}, (viewModel, model) => {
model.setEOL(EndOfLineSequence.LF);
let actual = viewModel.getPlainTextToCopy([new Range(2, 1, 5, 1)], true, true);
assert.deepEqual(actual, 'line2\r\nline3\r\nline4\r\n');
assert.deepStrictEqual(actual, 'line2\r\nline3\r\nline4\r\n');
});
});
test('issue #40926: Incorrect spacing when inserting new line after multiple folded blocks of code', () => {
testViewModel(
[
'foo = {',
' foobar: function() {',
' this.foobar();',
' },',
' foobar: function() {',
' this.foobar();',
' },',
' foobar: function() {',
' this.foobar();',
' },',
'}',
], {}, (viewModel, model) => {
viewModel.setHiddenAreas([
new Range(3, 1, 3, 1),
new Range(6, 1, 6, 1),
new Range(9, 1, 9, 1),
]);
model.applyEdits([
{ range: new Range(4, 7, 4, 7), text: '\n ' },
{ range: new Range(7, 7, 7, 7), text: '\n ' },
{ range: new Range(10, 7, 10, 7), text: '\n ' }
]);
assert.strictEqual(viewModel.getLineCount(), 11);
}
);
});
});