fix(vscode): make sure diff is closed alongside the ai fix view (#2578)

Author: MaxKless

libs/vscode/nx-cloud-fix-webview/src/main.ts

@@ -30,7 +30,6 @@ export class Root extends LitElement {
     super.connectedCallback();
     // Listen for messages from the extension
     window.addEventListener('message', (event) => {
-      console.log('Received message from extension:', event);
       if (event.data.type === 'update-details') {
         globalThis.fixDetails = event.data.details as NxCloudFixData;
         this.requestUpdate();

libs/vscode/nx-cloud-view/src/init-nx-cloud-view.ts

@@ -29,9 +29,14 @@ import { CloudOnboardingViewProvider } from './cloud-onboarding-view';
 import { CloudRecentCIPEProvider } from './cloud-recent-cipe-view';
 import { machine } from './cloud-view-state-machine';
 import { TelemetryEventSource } from '@nx-console/shared-telemetry';
-import { NxCloudFixWebview } from './nx-cloud-fix-webview';
+import {
+  closeCloudFixDiffTab,
+  NxCloudFixWebview,
+} from './nx-cloud-fix-webview';
 
 export function initNxCloudView(context: ExtensionContext) {
+  closeCloudFixDiffTab();
+
   // set up state machine & listeners
   const actor = createActor(
     machine.provide({

libs/vscode/nx-cloud-view/src/nx-cloud-fix-webview.ts

@@ -11,13 +11,16 @@ import { getNxCloudStatus } from '@nx-console/vscode-nx-workspace';
 import { outputLogger } from '@nx-console/vscode-output-channels';
 import { getTelemetry } from '@nx-console/vscode-telemetry';
 import { getWorkspacePath, GitExtension } from '@nx-console/vscode-utils';
+import { unlink, writeFile } from 'fs/promises';
+import { tmpdir } from 'os';
 import { join } from 'path';
 import { xhr } from 'request-light';
 import {
   commands,
   EventEmitter,
   ExtensionContext,
   extensions,
+  Tab,
   Uri,
   ViewColumn,
   WebviewPanel,
@@ -27,8 +30,6 @@ import {
 import { ActorRef, EventObject } from 'xstate';
 import { DiffContentProvider, parseGitDiff } from './diffs/diff-provider';
 import { createUnifiedDiffView } from './nx-cloud-fix-tree-item';
-import { unlink, writeFile } from 'fs/promises';
-import { tmpdir } from 'os';
 
 export interface NxCloudFixDetails {
   cipe: CIPEInfo;
@@ -110,10 +111,13 @@ export class NxCloudFixWebview {
       },
     );
 
-    this.webviewPanel.onDidDispose(() => {
+    this.webviewPanel.onDidDispose(async () => {
       this.webviewPanel = undefined;
       this.currentFixDetails = undefined;
       this._onDispose.fire();
+
+      // Close the diff tab associated with this fix
+      await closeCloudFixDiffTab();
     });
 
     this.webviewPanel.webview.html = this.getWebviewHtml(
@@ -567,3 +571,20 @@ async function updateSuggestedFix(
     return false;
   }
 }
+
+export async function closeCloudFixDiffTab() {
+  const diffTab = window.tabGroups.all
+    .flatMap((g) => g.tabs)
+    .find((t) => isCloudFixTab(t));
+
+  if (diffTab) {
+    await window.tabGroups.close(diffTab, true);
+  }
+}
+
+function isCloudFixTab(tab: Tab): boolean {
+  return (
+    (tab as any)?.input?.textDiffs?.[0]?.original?.scheme ===
+    'nx-cloud-fix-before'
+  );
+}