diff --git a/vscode/src/mutations.ts b/vscode/src/mutations.ts index 45270db..1e9b09f 100644 --- a/vscode/src/mutations.ts +++ b/vscode/src/mutations.ts @@ -111,7 +111,7 @@ export class MutationsTreeDataProvider implements vscode.TreeDataProvider new NamedMutationTreeItemData(new Mutation(m))); } @@ -120,7 +120,7 @@ export class MutationsTreeDataProvider implements vscode.TreeDataProvider compare(a.mutatorName, b.mutatorName)); return this.data; } else { - return await element.children(this.apiClient, this.workspaceState); + return element.children(); } } @@ -213,7 +213,7 @@ abstract class MutationsTreeItemData { treeItem(workspaceData: MutationsTreeMemento): vscode.TreeItem { let state = vscode.TreeItemCollapsibleState.Collapsed; - if (!this.canHaveChildren(workspaceData)) { + if (!this.canHaveChildren()) { state = vscode.TreeItemCollapsibleState.None; } @@ -236,11 +236,11 @@ abstract class MutationsTreeItemData { return item; } - canHaveChildren(_workspaceData: MutationsTreeMemento): boolean { + canHaveChildren(): boolean { return false; } - async children(_apiClient: api.Client, _workspaceState: MutationsTreeMemento): Promise { + children(): MutationsTreeItemData[] { return []; } } @@ -254,14 +254,11 @@ export class MutationsGroupByNameTreeItemData extends MutationsTreeItemData { this.tooltip = new vscode.MarkdownString(tooltip); } - override canHaveChildren(_workspaceData: MutationsTreeMemento): boolean { + override canHaveChildren(): boolean { return true; } - override async children( - _apiClient: api.Client, - _workspaceState: MutationsTreeMemento - ): Promise { + override children(): MutationsTreeItemData[] { return this.childItems; } @@ -315,15 +312,12 @@ export class NamedMutationTreeItemData extends MutationsTreeItemData { super.iconPath = new vscode.ThemeIcon("zap"); } - override canHaveChildren(_workspaceData: MutationsTreeMemento): boolean { + override canHaveChildren(): boolean { // TODO - always true once created-at/etc is added return this.mutation.experimentName != null || this.mutation.params.size != 0; } - override async children( - _apiClient: api.Client, - _workspaceState: MutationsTreeMemento - ): Promise { + override children(): MutationsTreeItemData[] { const children = []; if (this.mutation.experimentName) { children.push(new MutationDetailLeafTreeItemData(`Experiment: ${this.mutation.experimentName}`)); @@ -341,14 +335,11 @@ export class MutationParametersTreeItemData extends MutationsTreeItemData { super("Parameters"); } - override canHaveChildren(_workspaceData: MutationsTreeMemento): boolean { + override canHaveChildren(): boolean { return true; } - override async children( - _apiClient: api.Client, - _workspaceState: MutationsTreeMemento - ): Promise { + override children(): MutationsTreeItemData[] { const children = []; for (const [paramName, paramValue] of this.mutation.params) { children.push(new MutationDetailLeafTreeItemData(`${paramName}: ${paramValue}`)); diff --git a/vscode/src/mutators.ts b/vscode/src/mutators.ts index a2ccf30..476aadb 100644 --- a/vscode/src/mutators.ts +++ b/vscode/src/mutators.ts @@ -83,7 +83,7 @@ export class MutatorsTreeDataProvider implements vscode.TreeDataProvider { @@ -99,7 +99,7 @@ export class MutatorsTreeDataProvider implements vscode.TreeDataProvider new NamedMutatorTreeItemData(new Mutator(m))); } @@ -107,7 +107,7 @@ export class MutatorsTreeDataProvider implements vscode.TreeDataProvider compare(a.name, b.name)); return this.data; } else { - return await element.children(this.apiClient, this.workspaceState); + return element.children(); } } @@ -181,9 +181,9 @@ abstract class MutatorsTreeItemData { constructor(public name: string) {} - treeItem(workspaceData: MutatorsTreeMemento): vscode.TreeItem { + treeItem(): vscode.TreeItem { let state = vscode.TreeItemCollapsibleState.Collapsed; - if (!this.canHaveChildren(workspaceData)) { + if (!this.canHaveChildren()) { state = vscode.TreeItemCollapsibleState.None; } @@ -206,11 +206,11 @@ abstract class MutatorsTreeItemData { return item; } - canHaveChildren(_workspaceData: MutatorsTreeMemento): boolean { + canHaveChildren(): boolean { return false; } - async children(_apiClient: api.Client, _workspaceState: MutatorsTreeMemento): Promise { + children(): MutatorsTreeItemData[] { return []; } } @@ -224,14 +224,11 @@ export class MutatorsGroupByNameTreeItemData extends MutatorsTreeItemData { this.tooltip = new vscode.MarkdownString(tooltip); } - override canHaveChildren(_workspaceData: MutatorsTreeMemento): boolean { + override canHaveChildren(): boolean { return true; } - override async children( - _apiClient: api.Client, - _workspaceState: MutatorsTreeMemento - ): Promise { + override children(): MutatorsTreeItemData[] { return this.childItems; } @@ -275,14 +272,11 @@ export class NamedMutatorTreeItemData extends MutatorsTreeItemData { this.iconPath = new vscode.ThemeIcon("outline-view-icon"); } - override canHaveChildren(_workspaceData: MutatorsTreeMemento): boolean { + override canHaveChildren(): boolean { return true; } - override async children( - _apiClient: api.Client, - _workspaceState: MutatorsTreeMemento - ): Promise { + override children(): MutatorsTreeItemData[] { const children = []; if (this.mutator.description) { children.push(new MutatorDetailLeafTreeItemData(`${this.mutator.description}`)); @@ -314,14 +308,11 @@ export class MutatorOrgMetadataTreeItemData extends MutatorsTreeItemData { super.iconPath = new vscode.ThemeIcon("organization"); } - override canHaveChildren(_workspaceData: MutatorsTreeMemento): boolean { + override canHaveChildren(): boolean { return true; } - override async children( - _apiClient: api.Client, - _workspaceState: MutatorsTreeMemento - ): Promise { + override children(): MutatorsTreeItemData[] { const children = []; for (const [k, v] of this.orgMetadataAttrs) { children.push(new MutatorDetailLeafTreeItemData(`${k}: ${v}`)); @@ -337,14 +328,11 @@ export class MutatorParametersTreeItemData extends MutatorsTreeItemData { super.iconPath = new vscode.ThemeIcon("output"); } - override canHaveChildren(_workspaceData: MutatorsTreeMemento): boolean { + override canHaveChildren(): boolean { return true; } - override async children( - _apiClient: api.Client, - _workspaceState: MutatorsTreeMemento - ): Promise { + override children(): MutatorsTreeItemData[] { const children = []; for (const p of this.params) { children.push(new MutatorParameterTreeItemData(p)); @@ -359,14 +347,11 @@ export class MutatorParameterTreeItemData extends MutatorsTreeItemData { super(param.name); } - override canHaveChildren(_workspaceData: MutatorsTreeMemento): boolean { + override canHaveChildren(): boolean { return true; } - override async children( - _apiClient: api.Client, - _workspaceState: MutatorsTreeMemento - ): Promise { + override children(): MutatorsTreeItemData[] { const children = []; if (this.param.description) { children.push(new MutatorDetailLeafTreeItemData(`${this.param.description}`));