ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-03 09:35:40 -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

2
src/vs/platform/keybinding/common/abstractKeybindingService.ts
View File

@@ -61,7 +61,7 @@ export abstract class AbstractKeybindingService extends Disposable implements IK
this._logging = false;
}
public dispose(): void {
public override dispose(): void {
super.dispose();
}

3
src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
View File

@@ -118,6 +118,7 @@ suite('AbstractKeybindingService', () => {
contextMatchesRules: undefined!,
getContextKeyValue: undefined!,
createScoped: undefined!,
createOverlay: undefined!,
getContext: (target: IContextKeyServiceTarget): any => {
return currentContextValue;
},
@@ -139,6 +140,8 @@ suite('AbstractKeybindingService', () => {
let notificationService: INotificationService = {
_serviceBrand: undefined,
onDidAddNotification: undefined!,
onDidRemoveNotification: undefined!,
notify: (notification: INotification) => {
showMessageCalls.push({ sev: notification.severity, message: notification.message });
return new NoOpNotification();

5
src/vs/platform/keybinding/test/common/mockKeybindingService.ts
View File

@@ -66,6 +66,9 @@ export class MockContextKeyService implements IContextKeyService {
public createScoped(domNode: HTMLElement): IContextKeyService {
return this;
}
public createOverlay(): IContextKeyService {
return this;
}
updateParent(_parentContextKeyService: IContextKeyService): void {
// no-op
}
@@ -75,7 +78,7 @@ export class MockScopableContextKeyService extends MockContextKeyService {
/**
* Don't implement this for all tests since we rarely depend on this behavior and it isn't implemented fully
*/
public createScoped(domNote: HTMLElement): IContextKeyService {
public override createScoped(domNote: HTMLElement): IContextKeyService {
return new MockContextKeyService();
}
}