Reland "[PatchWidget] Handle discard and saveAll actions"

This reverts commit 6b151b0.

Reason for revert: Relanding after fixing test failures
(We weren't setting the selected workspace in the test, and
weren't resetting `workspaceDiff` before tests)

Original change's description:
> Revert "[PatchWidget] Handle `discard` and `saveAll` actions"
>
> This reverts commit 34e26e6.
>
> Reason for revert: Waterfall turned red with this CL.
>
> Original change's description:
> > [PatchWidget] Handle `discard` and `saveAll` actions
> >
> > Fixed: 399559699
> > Change-Id: I14073f0e3b8107ff4b632c0b87c7c90aeec1feab
> > Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6348560
> > Reviewed-by: Wolfgang Beyer <[email protected]>
> > Reviewed-by: Alex Rudenko <[email protected]>
> > Commit-Queue: Ergün Erdoğmuş <[email protected]>
>
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: I9ededca126a5c3c2350f6df87e1853e4ec82f571
> Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6357069
> Commit-Queue: Rubber Stamper <[email protected]>
> Bot-Commit: Rubber Stamper <[email protected]>
> Auto-Submit: Philip Pfaffe <[email protected]>

Bug: 399559699
Change-Id: I08a1117ee6a01377421ec85917bf2fc85fc0d7a4
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6357070
Reviewed-by: Alex Rudenko <[email protected]>
Commit-Queue: Ergün Erdoğmuş <[email protected]>

Author: ergunsh

front_end/models/workspace_diff/WorkspaceDiff.ts

@@ -304,8 +304,8 @@ export interface UISourceCodeDiffEventTypes {
 
 let workspaceDiffImplInstance: WorkspaceDiffImpl|null = null;
 
-export function workspaceDiff(): WorkspaceDiffImpl {
-  if (!workspaceDiffImplInstance) {
+export function workspaceDiff({forceNew}: {forceNew?: boolean} = {}): WorkspaceDiffImpl {
+  if (!workspaceDiffImplInstance || forceNew) {
     workspaceDiffImplInstance = new WorkspaceDiffImpl(Workspace.Workspace.WorkspaceImpl.instance());
   }
   return workspaceDiffImplInstance;

front_end/panels/ai_assistance/PatchWidget.test.ts

@@ -9,6 +9,7 @@ import * as PanelCommon from '../../panels/common/common.js';
 import {
   cleanup,
   createPatchWidget,
+  createPatchWidgetWithDiffView,
   createTestFilesystem,
   initializePersistenceImplForTests,
   mockAidaClient,
@@ -176,4 +177,51 @@ Files:
       assert.strictEqual(input.projectName, 'test2');
     });
   });
+
+  describe('diff view', () => {
+    let uiSourceCode: Workspace.UISourceCode.UISourceCode;
+    let commitWorkingCopyStub:
+        sinon.SinonStub<Parameters<typeof Workspace.UISourceCode.UISourceCode.prototype.commitWorkingCopy>>;
+    let resetWorkingCopyStub:
+        sinon.SinonStub<Parameters<typeof Workspace.UISourceCode.UISourceCode.prototype.resetWorkingCopy>>;
+
+    beforeEach(() => {
+      uiSourceCode = createTestFilesystem('file://test').uiSourceCode;
+      Common.Settings.Settings.instance().createSetting('ai-assistance-patching-selected-project-id', 'file://test');
+      updateHostConfig({
+        devToolsFreestyler: {
+          enabled: true,
+          patching: true,
+        },
+      });
+
+      commitWorkingCopyStub =
+          sinon.stub(Workspace.UISourceCode.UISourceCode.prototype, 'commitWorkingCopy').callThrough();
+      resetWorkingCopyStub =
+          sinon.stub(Workspace.UISourceCode.UISourceCode.prototype, 'resetWorkingCopy').callThrough();
+    });
+
+    it('save all should commit the working copy of the changed UI codes to the disk and render savedToDisk view',
+       async () => {
+         const {view} = await createPatchWidgetWithDiffView();
+         uiSourceCode.setWorkingCopy('working copy');
+
+         view.input.onSaveAll();
+         const nextInput = await view.nextInput;
+
+         assert.isTrue(nextInput.savedToDisk);
+         assert.isTrue(commitWorkingCopyStub.called, 'Expected commitWorkingCopy to be called but it is not called');
+       });
+
+    it('discard should discard the working copy and render the view without patchSuggestion', async () => {
+      const {view} = await createPatchWidgetWithDiffView();
+      uiSourceCode.setWorkingCopy('working copy');
+
+      view.input.onDiscard();
+      const nextInput = await view.nextInput;
+
+      assert.notExists(nextInput.patchSuggestion);
+      assert.isTrue(resetWorkingCopyStub.called, 'Expected resetWorkingCopy to be called but it is not called');
+    });
+  });
 });

front_end/panels/ai_assistance/PatchWidget.ts

@@ -501,14 +501,21 @@ ${processedFiles.map(filename => `* ${filename}`).join('\n')}`;
   }
 
   #onDiscard(): void {
-    // TODO: Remove changes from the working copies as well.
+    this.#workspaceDiff.modifiedUISourceCodes().forEach(modifiedUISourceCode => {
+      modifiedUISourceCode.resetWorkingCopy();
+    });
+
     this.#patchSuggestion = undefined;
     this.#patchSources = undefined;
     this.requestUpdate();
   }
 
   #onSaveAll(): void {
-    // TODO: Handle saving all the files.
+    // TODO: What should we do for the inspector stylesheet?
+    this.#workspaceDiff.modifiedUISourceCodes().forEach(modifiedUISourceCode => {
+      modifiedUISourceCode.commitWorkingCopy();
+    });
+
     this.#savedToDisk = true;
     this.requestUpdate();
   }

front_end/testing/AiAssistanceHelpers.ts

@@ -12,6 +12,7 @@ import * as Breakpoints from '../models/breakpoints/breakpoints.js';
 import * as Logs from '../models/logs/logs.js';
 import * as Persistence from '../models/persistence/persistence.js';
 import * as Workspace from '../models/workspace/workspace.js';
+import * as WorkspaceDiff from '../models/workspace_diff/workspace_diff.js';
 import * as AiAssistance from '../panels/ai_assistance/ai_assistance.js';
 
 import {findMenuItemWithLabel, getMenu} from './ContextMenuHelpers.js';
@@ -229,6 +230,16 @@ export async function createPatchWidget(options?: {
   };
 }
 
+export async function createPatchWidgetWithDiffView() {
+  const {view, panel, aidaClient} =
+      await createPatchWidget({aidaClient: mockAidaClient([[{explanation: 'patch applied'}]])});
+  panel.changeSummary = 'body { background-color: red; }';
+  view.input.onApplyToWorkspace();
+  assert.exists((await view.nextInput).patchSuggestion);
+
+  return {panel, view, aidaClient};
+}
+
 export function initializePersistenceImplForTests(): void {
   const workspace = Workspace.Workspace.WorkspaceImpl.instance({forceNew: true});
   const debuggerWorkspaceBinding = Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance({
@@ -244,6 +255,7 @@ export function initializePersistenceImplForTests(): void {
     debuggerWorkspaceBinding,
   });
   Persistence.Persistence.PersistenceImpl.instance({forceNew: true, workspace, breakpointManager});
+  WorkspaceDiff.WorkspaceDiff.workspaceDiff({forceNew: true});
 }
 
 export function cleanup() {