fix: discard

eclipse-theia · Jan 24, 2025 · fd53967 · fd53967
1 parent bf22854
commit fd53967
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/ai-chat-ui/src/browser/chat-input-widget.tsx b/packages/ai-chat-ui/src/browser/chat-input-widget.tsx
@@ -370,7 +370,7 @@ const buildChangeSetUI = (changeSet: ChangeSet, labelProvider: LabelProvider, on
         name: element.name ?? labelProvider.getName(element.uri),
         additionalInfo: element.additionalInfo ?? labelProvider.getDetails(element.uri),
         openChange: element?.openChange?.bind(element),
-        accept: element?.accept?.bind(element),
+        accept: element.state !== 'applied' ? element?.accept?.bind(element) : undefined,
         discard: element.state === 'applied' ? element?.discard?.bind(element) : undefined,
         delete: () => onDeleteChangeSetElement(changeSet.getElements().indexOf(element))
     }))

diff --git a/packages/ai-chat/src/browser/change-set-file-element.ts b/packages/ai-chat/src/browser/change-set-file-element.ts
@@ -128,8 +128,8 @@ export class ChangeSetFileElement implements ChangeSetElement {
             await this.changeSetFileService.delete(this.uri);
             return;
         }
-        if (this.type === 'delete' && this.originalContent) {
-            await this.changeSetFileService.write(this.uri, this.targetState);
+        if (this.originalContent) {
+            await this.changeSetFileService.write(this.uri, this.originalContent);
         }
     }
 

diff --git a/packages/ai-chat/src/browser/change-set-file-service.ts b/packages/ai-chat/src/browser/change-set-file-service.ts
@@ -136,7 +136,7 @@ export class ChangeSetFileService {
     protected async doWrite(uri: URI, text: string): Promise<void> {
         const document = this.monacoWorkspace.getTextDocument(uri.toString());
         if (document) {
-            this.monacoWorkspace.applyBackgroundEdit(document, [{
+            await this.monacoWorkspace.applyBackgroundEdit(document, [{
                 range: document.textEditorModel.getFullModelRange(),
                 text
             }], true);