Skip to content

fix: reset inline chat state when the edited file is deleted #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
laileni-aws wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: reset inline chat state when the edited file is deleted #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/amazonq/.changes/next-release/Bug Fix-93c75b36-50c8-480b-a289-cc1d209bfe5b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Bug Fix",
"description": "Inline chat: reset the accept/reject state (code lenses and Enter shortcut) when the file being edited is deleted, so the IDE no longer gets stuck"
}
22 changes: 22 additions & 0 deletions packages/amazonq/src/inlineChat/controller/inlineChatController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,28 @@ export class InlineChatController {
this.computeDiffAndRenderOnEditor = Experiments.instance.get('amazonqLSPInlineChat', false)
? this.computeDiffAndRenderOnEditorLSP.bind(this)
: this.computeDiffAndRenderOnEditorLocal.bind(this)

// If the file backing an active inline task is deleted, the task can no longer be
// accepted or rejected (its editor is gone), which would otherwise leave the
// accept/reject code lenses and the Enter-key shortcut context stuck until the IDE
// window is reopened. Clean up the inline task when its document is deleted.
context.subscriptions.push(
vscode.workspace.onDidDeleteFiles(async (event) => {
for (const uri of event.files) {
await this.cancelActiveTaskForDeletedDocument(uri)
}
})
)
}

/**
* Resets the inline chat state if the currently active task's document was deleted,
* so the code lenses and the Enter-key shortcut context do not get stuck.
*/
private async cancelActiveTaskForDeletedDocument(uri: vscode.Uri): Promise<void> {
if (this.task?.isActiveState() === true && this.task.document.uri.toString() === uri.toString()) {
await this.handleError()
}
}

public async createTask(
Expand Down
Loading