Skip to content

fix(amazonq): should pass nextToken to Flare for Edits on acceptance without calling provideInlineCompletionItems #7647

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 2 commits into from
Jul 11, 2025
Merged

fix(amazonq): should pass nextToken to Flare for Edits on acceptance without calling provideInlineCompletionItems #7647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa43192
fix: passing nextToken to Flare for Edits
atonaamz Jul 11, 2025
f23f978
Merge branch 'master' into nep-flare
atonaamz Jul 11, 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
27 changes: 14 additions & 13 deletions packages/amazonq/src/app/inline/EditRendering/displayImage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,19 +324,20 @@ export async function displaySvgDecoration(
isInlineEdit: true,
}
languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
// Only auto trigger on acceptance if there is a nextToken
if (inlineCompletionProvider && session.editsStreakPartialResultToken) {
await inlineCompletionProvider.provideInlineCompletionItems(
editor.document,
endPosition,
{
triggerKind: vscode.InlineCompletionTriggerKind.Automatic,
selectedCompletionInfo: undefined,
},
new vscode.CancellationTokenSource().token,
{ emitTelemetry: false, showUi: false, editsStreakToken: session.editsStreakPartialResultToken }
)
}
session.triggerOnAcceptance = true
Copy link
Contributor

@Will-ShaoHua Will-ShaoHua Jul 11, 2025

Choose a reason for hiding this comment

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

nit

if (isInlineEdit) {
   session.triggerOnAcceptance = true
}

Copy link
Contributor Author

@atonaamz atonaamz Jul 11, 2025

Choose a reason for hiding this comment

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

This code path in displayImage.ts always belongs to EDITS

Copy link
Contributor Author

@atonaamz atonaamz Jul 11, 2025

Choose a reason for hiding this comment

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

https://github.com/aws/aws-toolkit-vscode/blob/master/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts#L34

Copy link
Contributor

@Will-ShaoHua Will-ShaoHua Jul 11, 2025

Choose a reason for hiding this comment

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

oh good callout

// VS Code triggers suggestion on every keystroke, temporarily disable trigger on acceptance
// if (inlineCompletionProvider && session.editsStreakPartialResultToken) {
// await inlineCompletionProvider.provideInlineCompletionItems(
// editor.document,
// endPosition,
// {
// triggerKind: vscode.InlineCompletionTriggerKind.Automatic,
// selectedCompletionInfo: undefined,
// },
// new vscode.CancellationTokenSource().token,
// { emitTelemetry: false, showUi: false, editsStreakToken: session.editsStreakPartialResultToken }
// )
// }
},
async () => {
// Handle reject
Expand Down
6 changes: 6 additions & 0 deletions packages/amazonq/src/app/inline/completion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,12 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
const prevSessionId = prevSession?.sessionId
const prevItemId = this.sessionManager.getActiveRecommendation()?.[0]?.itemId
const prevStartPosition = prevSession?.startPosition
if (prevSession?.triggerOnAcceptance) {
getAllRecommendationsOptions = {
...getAllRecommendationsOptions,
editsStreakToken: prevSession?.editsStreakPartialResultToken,
}
}
const editor = window.activeTextEditor
if (prevSession && prevSessionId && prevItemId && prevStartPosition) {
const prefix = document.getText(new Range(prevStartPosition, position))
Expand Down
1 change: 1 addition & 0 deletions packages/amazonq/src/app/inline/sessionManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface CodeWhispererSession {
diagnosticsBeforeAccept: FileDiagnostic | undefined
// partialResultToken for the next trigger if user accepts an EDITS suggestion
editsStreakPartialResultToken?: number | string
triggerOnAcceptance?: boolean
}

export class SessionManager {
Expand Down
Loading