Skip to content

fix(amazonq): Fix edge cases of context command updates #6686

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

Merged
merged 6 commits into from
Feb 27, 2025
Merged

fix(amazonq): Fix edge cases of context command updates #6686

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d9b084
update mynahUI to beta 11
leigaol Feb 26, 2025
06876e2
fix edge cases of index update
leigaol Feb 26, 2025
f191329
Merge branch 'aws:feature/falcon' into feature/falcon
leigaol Feb 26, 2025
a68d84c
Merge branch 'feature/falcon' of github.com:leigaol/aws-toolkit-vscod…
leigaol Feb 26, 2025
cab8a6f
adjust timeout
leigaol Feb 26, 2025
83b9032
github actions
leigaol Feb 26, 2025
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
75 changes: 43 additions & 32 deletions packages/core/src/amazonq/lsp/lspClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,37 @@

let savedDocument: vscode.Uri | undefined = undefined

const onAdd = async (filePaths: string[]) => {
const indexSeqNum = await LspClient.instance.getIndexSequenceNumber()
await LspClient.instance.updateIndex(filePaths, 'add')
await waitUntil(
async () => {
const newIndexSeqNum = await LspClient.instance.getIndexSequenceNumber()
if (newIndexSeqNum > indexSeqNum) {
await vscode.commands.executeCommand(`aws.amazonq.updateContextCommandItems`)
return true
}
return false
},
{ interval: 500, timeout: 5_000, truthy: true }
)
}
const onRemove = async (filePaths: string[]) => {
Copy link
Contributor

@justinmk3 justinmk3 Feb 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is nearly identical to the onAdd case above.

const indexSeqNum = await LspClient.instance.getIndexSequenceNumber()
await LspClient.instance.updateIndex(filePaths, 'remove')
await waitUntil(
async () => {
const newIndexSeqNum = await LspClient.instance.getIndexSequenceNumber()
if (newIndexSeqNum > indexSeqNum) {
await vscode.commands.executeCommand(`aws.amazonq.updateContextCommandItems`)
return true
}
return false
},
{ interval: 500, timeout: 5_000, truthy: true }
)
}

toDispose.push(
vscode.workspace.onDidSaveTextDocument((document) => {
if (document.uri.scheme !== 'file') {
Expand All @@ -326,42 +357,22 @@
if (savedDocument && editor && editor.document.uri.fsPath !== savedDocument.fsPath) {
void LspClient.instance.updateIndex([savedDocument.fsPath], 'update')
}
// user created a new empty file using File -> New File
// these events will not be captured by vscode.workspace.onDidCreateFiles
// because it was created by File Explorer(Win) or Finder(MacOS)
if (editor?.document.getText().length === 0) {
onAdd([editor.document.uri.fsPath])

Check failure on line 364 in packages/core/src/amazonq/lsp/lspClient.ts

View workflow job for this annotation

GitHub Actions / lint (18.x, stable) 

Promises must be awaited, end with a call to .catch, end with a call to .then with a rejection handler or be explicitly marked as ignored with the `void` operator
}
}),
vscode.workspace.onDidCreateFiles(async (e) => {
const indexSeqNum = await LspClient.instance.getIndexSequenceNumber()
await LspClient.instance.updateIndex(
e.files.map((f) => f.fsPath),
'add'
)
await waitUntil(
async () => {
const newIndexSeqNum = await LspClient.instance.getIndexSequenceNumber()
if (newIndexSeqNum > indexSeqNum) {
await vscode.commands.executeCommand(`aws.amazonq.updateContextCommandItems`)
return true
}
return false
},
{ interval: 500, timeout: 10_000, truthy: true }
)
onAdd(e.files.map((f) => f.fsPath))

Check failure on line 368 in packages/core/src/amazonq/lsp/lspClient.ts

View workflow job for this annotation

GitHub Actions / lint (18.x, stable) 

Promises must be awaited, end with a call to .catch, end with a call to .then with a rejection handler or be explicitly marked as ignored with the `void` operator
}),
vscode.workspace.onDidDeleteFiles(async (e) => {
const indexSeqNum = await LspClient.instance.getIndexSequenceNumber()
await LspClient.instance.updateIndex(
e.files.map((f) => f.fsPath),
'remove'
)
await waitUntil(
async () => {
const newIndexSeqNum = await LspClient.instance.getIndexSequenceNumber()
if (newIndexSeqNum > indexSeqNum) {
await vscode.commands.executeCommand(`aws.amazonq.updateContextCommandItems`)
return true
}
return false
},
{ interval: 500, timeout: 10_000, truthy: true }
)
onRemove(e.files.map((f) => f.fsPath))

Check failure on line 371 in packages/core/src/amazonq/lsp/lspClient.ts

View workflow job for this annotation

GitHub Actions / lint (18.x, stable) 

Promises must be awaited, end with a call to .catch, end with a call to .then with a rejection handler or be explicitly marked as ignored with the `void` operator
}),
vscode.workspace.onDidRenameFiles(async (e) => {
await onRemove(e.files.map((f) => f.oldUri.fsPath))
await onAdd(e.files.map((f) => f.newUri.fsPath))
})
)

Expand Down
Loading