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

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/vs/platform/markers/test/common/markerService.test.ts
View File

@@ -30,10 +30,10 @@ suite('Marker Service', () => {
marker: randomMarkerData(MarkerSeverity.Error)
}]);
assert.equal(service.read().length, 1);
assert.equal(service.read({ owner: 'far' }).length, 1);
assert.equal(service.read({ resource: URI.parse('file:///c/test/file.cs') }).length, 1);
assert.equal(service.read({ owner: 'far', resource: URI.parse('file:///c/test/file.cs') }).length, 1);
assert.strictEqual(service.read().length, 1);
assert.strictEqual(service.read({ owner: 'far' }).length, 1);
assert.strictEqual(service.read({ resource: URI.parse('file:///c/test/file.cs') }).length, 1);
assert.strictEqual(service.read({ owner: 'far', resource: URI.parse('file:///c/test/file.cs') }).length, 1);
service.changeAll('boo', [{
@@ -41,14 +41,14 @@ suite('Marker Service', () => {
marker: randomMarkerData(MarkerSeverity.Warning)
}]);
assert.equal(service.read().length, 2);
assert.equal(service.read({ owner: 'far' }).length, 1);
assert.equal(service.read({ owner: 'boo' }).length, 1);
assert.strictEqual(service.read().length, 2);
assert.strictEqual(service.read({ owner: 'far' }).length, 1);
assert.strictEqual(service.read({ owner: 'boo' }).length, 1);
assert.equal(service.read({ severities: MarkerSeverity.Error }).length, 1);
assert.equal(service.read({ severities: MarkerSeverity.Warning }).length, 1);
assert.equal(service.read({ severities: MarkerSeverity.Hint }).length, 0);
assert.equal(service.read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning }).length, 2);
assert.strictEqual(service.read({ severities: MarkerSeverity.Error }).length, 1);
assert.strictEqual(service.read({ severities: MarkerSeverity.Warning }).length, 1);
assert.strictEqual(service.read({ severities: MarkerSeverity.Hint }).length, 0);
assert.strictEqual(service.read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning }).length, 2);
});
@@ -57,17 +57,17 @@ suite('Marker Service', () => {
let service = new markerService.MarkerService();
service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
assert.equal(service.read().length, 1);
assert.equal(service.read({ owner: 'far' }).length, 1);
assert.strictEqual(service.read().length, 1);
assert.strictEqual(service.read({ owner: 'far' }).length, 1);
service.changeOne('boo', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
assert.equal(service.read().length, 2);
assert.equal(service.read({ owner: 'far' }).length, 1);
assert.equal(service.read({ owner: 'boo' }).length, 1);
assert.strictEqual(service.read().length, 2);
assert.strictEqual(service.read({ owner: 'far' }).length, 1);
assert.strictEqual(service.read({ owner: 'boo' }).length, 1);
service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData(), randomMarkerData()]);
assert.equal(service.read({ owner: 'far' }).length, 2);
assert.equal(service.read({ owner: 'boo' }).length, 1);
assert.strictEqual(service.read({ owner: 'far' }).length, 2);
assert.strictEqual(service.read({ owner: 'boo' }).length, 1);
});
@@ -76,19 +76,19 @@ suite('Marker Service', () => {
let service = new markerService.MarkerService();
service.changeOne('far', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
service.changeOne('boo', URI.parse('file:///path/only.cs'), [randomMarkerData()]);
assert.equal(service.read({ owner: 'far' }).length, 1);
assert.equal(service.read({ owner: 'boo' }).length, 1);
assert.equal(service.read().length, 2);
assert.strictEqual(service.read({ owner: 'far' }).length, 1);
assert.strictEqual(service.read({ owner: 'boo' }).length, 1);
assert.strictEqual(service.read().length, 2);
service.changeOne('far', URI.parse('file:///path/only.cs'), []);
assert.equal(service.read({ owner: 'far' }).length, 0);
assert.equal(service.read({ owner: 'boo' }).length, 1);
assert.equal(service.read().length, 1);
assert.strictEqual(service.read({ owner: 'far' }).length, 0);
assert.strictEqual(service.read({ owner: 'boo' }).length, 1);
assert.strictEqual(service.read().length, 1);
service.changeAll('boo', []);
assert.equal(service.read({ owner: 'far' }).length, 0);
assert.equal(service.read({ owner: 'boo' }).length, 0);
assert.equal(service.read().length, 0);
assert.strictEqual(service.read({ owner: 'far' }).length, 0);
assert.strictEqual(service.read({ owner: 'boo' }).length, 0);
assert.strictEqual(service.read().length, 0);
});
test('changeAll sends event for cleared', () => {
@@ -102,12 +102,12 @@ suite('Marker Service', () => {
marker: randomMarkerData()
}]);
assert.equal(service.read({ owner: 'far' }).length, 2);
assert.strictEqual(service.read({ owner: 'far' }).length, 2);
service.onMarkerChanged(changedResources => {
assert.equal(changedResources.length, 1);
changedResources.forEach(u => assert.equal(u.toString(), 'file:///d/path'));
assert.equal(service.read({ owner: 'far' }).length, 0);
assert.strictEqual(changedResources.length, 1);
changedResources.forEach(u => assert.strictEqual(u.toString(), 'file:///d/path'));
assert.strictEqual(service.read({ owner: 'far' }).length, 0);
});
service.changeAll('far', []);
@@ -124,7 +124,7 @@ suite('Marker Service', () => {
marker: randomMarkerData()
}]);
assert.equal(service.read({ owner: 'far' }).length, 2);
assert.strictEqual(service.read({ owner: 'far' }).length, 2);
});
test('changeAll must not break integrety, issue #12635', () => {
@@ -151,8 +151,8 @@ suite('Marker Service', () => {
marker: randomMarkerData()
}]);
assert.equal(service.read({ owner: 'far' }).length, 2);
assert.equal(service.read({ resource: URI.parse('scheme:path1') }).length, 2);
assert.strictEqual(service.read({ owner: 'far' }).length, 2);
assert.strictEqual(service.read({ resource: URI.parse('scheme:path1') }).length, 2);
});
test('invalid marker data', () => {
@@ -162,15 +162,15 @@ suite('Marker Service', () => {
data.message = undefined!;
service.changeOne('far', URI.parse('some:uri/path'), [data]);
assert.equal(service.read({ owner: 'far' }).length, 0);
assert.strictEqual(service.read({ owner: 'far' }).length, 0);
data.message = null!;
service.changeOne('far', URI.parse('some:uri/path'), [data]);
assert.equal(service.read({ owner: 'far' }).length, 0);
assert.strictEqual(service.read({ owner: 'far' }).length, 0);
data.message = 'null';
service.changeOne('far', URI.parse('some:uri/path'), [data]);
assert.equal(service.read({ owner: 'far' }).length, 1);
assert.strictEqual(service.read({ owner: 'far' }).length, 1);
});
test('MapMap#remove returns bad values, https://github.com/microsoft/vscode/issues/13548', () => {
@@ -189,7 +189,7 @@ suite('Marker Service', () => {
endLineNumber: 1,
endColumn: 5,
message: 'test',
severity: 0,
severity: 0 as MarkerSeverity,
source: 'me'
};
let service = new markerService.MarkerService();
@@ -197,7 +197,7 @@ suite('Marker Service', () => {
service.changeOne('far', URI.parse('some:thing'), [data]);
let marker = service.read({ resource: URI.parse('some:thing') });
assert.equal(marker.length, 1);
assert.equal(marker[0].code, '0');
assert.strictEqual(marker.length, 1);
assert.strictEqual(marker[0].code, '0');
});
});