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

@@ -37,7 +37,7 @@ export class ControllerTreeNode extends TreeNode {
});
}
public async getChildren(): Promise<TreeNode[]> {
public override async getChildren(): Promise<TreeNode[]> {
try {
await this.model.refresh(false);
this.updateChildren(this.model.registrations);
@@ -60,7 +60,7 @@ export class ControllerTreeNode extends TreeNode {
return this._children.length > 0 ? this._children : [new NoInstancesTreeNode()];
}
public async openDashboard(): Promise<void> {
public override async openDashboard(): Promise<void> {
const controllerDashboard = new ControllerDashboard(this.model);
await controllerDashboard.showDashboard();
}

View File

@@ -19,7 +19,7 @@ export class MiaaTreeNode extends ResourceTreeNode<MiaaModel> {
super(model.info.name, vscode.TreeItemCollapsibleState.None, ResourceType.sqlManagedInstances, model);
}
public async openDashboard(): Promise<void> {
public override async openDashboard(): Promise<void> {
const miaaDashboard = new MiaaDashboard(this._controllerModel, this.model);
await miaaDashboard.showDashboard();
}

View File

@@ -19,7 +19,7 @@ export class PostgresTreeNode extends ResourceTreeNode<PostgresModel> {
super(model.info.name, vscode.TreeItemCollapsibleState.None, ResourceType.postgresInstances, model);
}
public async openDashboard(): Promise<void> {
public override async openDashboard(): Promise<void> {
const postgresDashboard = new PostgresDashboard(this._context, this._controllerModel, this.model);
await postgresDashboard.showDashboard();
}

View File

@@ -17,7 +17,7 @@ export class RefreshTreeNode extends TreeNode {
super(loc.refreshToEnterCredentials, vscode.TreeItemCollapsibleState.None, '');
}
public command: vscode.Command = {
public override command: vscode.Command = {
command: refreshActionId,
title: loc.refreshToEnterCredentials,
arguments: [this._parent]

View File

@@ -20,6 +20,6 @@ export abstract class TreeNode extends vscode.TreeItem {
public async openDashboard(): Promise<void> { }
iconPath = getResourceTypeIcon(this.resourceType);
contextValue = this.resourceType;
override iconPath = getResourceTypeIcon(this.resourceType);
override contextValue = this.resourceType;
}