Merge branch 'elinor/add-kiota-workspace' into elinor/fix-regeneratio…

…n-issue
microsoft · Jun 28, 2024 · af0cd0b · af0cd0b
2 parents 395a42b + 361d3ae
commit af0cd0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/vscode/microsoft-kiota/src/extension.ts b/vscode/microsoft-kiota/src/extension.ts
@@ -305,6 +305,7 @@ export async function activate(
     {
       await checkForSuccess(result);
       openApiTreeProvider.refreshView();
+      openApiTreeProvider.setSelectionChanged(false);
       await loadLockFile({fsPath: workspaceJsonPath}, openApiTreeProvider, config.pluginName);
       await updateTreeViewIcons(treeViewId, false, true);
       await exportLogsAndShowErrors(result);
@@ -347,6 +348,7 @@ export async function activate(
     {
       await checkForSuccess(result);
       openApiTreeProvider.refreshView();
+      openApiTreeProvider.setSelectionChanged(false);
       await loadLockFile({fsPath: workspaceJsonPath}, openApiTreeProvider, config.pluginName);
       await updateTreeViewIcons(treeViewId, false, true);
       await exportLogsAndShowErrors(result);
@@ -418,6 +420,7 @@ export async function activate(
     {
       await checkForSuccess(result);
       openApiTreeProvider.refreshView();
+      openApiTreeProvider.setSelectionChanged(false);
       await loadLockFile({fsPath: workspaceJsonPath}, openApiTreeProvider, config.clientClassName);
       await updateTreeViewIcons(treeViewId, false, true);
       await exportLogsAndShowErrors(result);
@@ -455,8 +458,8 @@ export async function activate(
     );
     return result;
     });
-
   void vscode.window.showInformationMessage(`Client ${clientKey} re-generated successfully.`);
+  openApiTreeProvider.setSelectionChanged(false);
   }
   async function regeneratePlugin(clientKey: string, clientObject:any, settings: ExtensionSettings,  selectedPaths?: string[]) {
     const pluginTypes = typeof clientObject.pluginTypes === 'string' ? parsePluginType(clientObject.pluginTypes) : KiotaPluginType.ApiPlugin;
@@ -490,6 +493,7 @@ export async function activate(
       return result;
     });
     void vscode.window.showInformationMessage(`Plugin ${clientKey} re-generated successfully.`);
+    openApiTreeProvider.setSelectionChanged(false);
   }
 
   // create a new status bar item that we can now manage

diff --git a/vscode/microsoft-kiota/src/openApiTreeProvider.ts b/vscode/microsoft-kiota/src/openApiTreeProvider.ts
@@ -171,8 +171,8 @@ export class OpenApiTreeProvider implements vscode.TreeDataProvider<OpenApiTreeN
     public hasSelectionChanged(): boolean {
         return this.selectionChanged;
     }
-    public setSelectionChanged() {
-        this.selectionChanged = true;
+    public setSelectionChanged(state: boolean) {
+        this.selectionChanged = state;
     }
     public async setDescriptionUrl(descriptionUrl: string): Promise<void> {
         this.closeDescription(false);
@@ -196,7 +196,7 @@ export class OpenApiTreeProvider implements vscode.TreeDataProvider<OpenApiTreeN
     }
     private selectInternal(apiNode: KiotaOpenApiNode, selected: boolean, recursive: boolean) {
         apiNode.selected = selected;
-        this.setSelectionChanged();
+        this.setSelectionChanged(true);
         const isOperationNode = apiNode.isOperation ?? false;
         if (recursive) {
             apiNode.children.forEach(x => this.selectInternal(x, selected, recursive));
@@ -206,7 +206,7 @@ export class OpenApiTreeProvider implements vscode.TreeDataProvider<OpenApiTreeN
             const parent = this.findApiNode(getPathSegments(trimOperation(apiNode.path)), this.rawRootNode);
             if (parent) {
                 parent.selected = selected;
-                this.setSelectionChanged();
+                this.setSelectionChanged(true);
             }
         }
     }