Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* 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

View File

@@ -44,7 +44,7 @@ export class EventEmitterCollection extends vscode.Disposable {
emitter.dispose();
}
public dispose(): any {
public override dispose(): any {
this._events.forEach(events => {
events.forEach(event => {
event.dispose();

View File

@@ -97,7 +97,8 @@ function createContext(): TestContext {
globalStorageUri: vscode.Uri.parse('test://'),
logUri: vscode.Uri.parse('test://'),
storageUri: undefined,
secrets: undefined as any
secrets: undefined as any,
extension: undefined as any
},
outputChannel: {
name: '',

View File

@@ -130,7 +130,7 @@ export class ModelManagementController extends ControllerBase {
* Register events in the main view
* @param view main view
*/
public registerEvents(view: ModelViewBase): void {
public override registerEvents(view: ModelViewBase): void {
// Register events
//

View File

@@ -86,7 +86,7 @@ export abstract class ModelViewBase extends ViewBase {
super(apiWrapper, root, parent);
}
protected getEventNames(): string[] {
protected override getEventNames(): string[] {
return super.getEventNames().concat([ListModelsEventName,
ListAzureModelsEventName,
ListAccountsEventName,

View File

@@ -199,7 +199,7 @@ export abstract class ViewBase extends EventEmitterCollection {
public abstract refresh(): Promise<void>;
public dispose(): void {
public override dispose(): void {
super.dispose();
this._toDispose.forEach(disposable => disposable.dispose());
}

View File

@@ -110,8 +110,4 @@ export class WizardView extends MainViewBase {
public get wizard(): azdata.window.Wizard | undefined {
return this._wizard;
}
public async refresh(): Promise<void> {
await super.refresh();
}
}