Skip to content

fix(amazonq): should check if partialResultToken is empty for EDITS trigger on acceptance #7686

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 1 commit into from
Jul 17, 2025
Merged

fix(amazonq): should check if partialResultToken is empty for EDITS trigger on acceptance #7686

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
25 changes: 13 additions & 12 deletions packages/amazonq/src/app/inline/recommendationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,22 +114,23 @@ export class RecommendationService {
)

const isInlineEdit = result.items.some((item) => item.isInlineEdit)
if (!isInlineEdit) {
// If the suggestion is COMPLETIONS and there are more results to fetch, handle them in the background
getLogger().info(
'Suggestion type is COMPLETIONS. Start fetching for more items if partialResultToken exists.'
)
if (result.partialResultToken) {

if (result.partialResultToken) {
if (!isInlineEdit) {
// If the suggestion is COMPLETIONS and there are more results to fetch, handle them in the background
getLogger().info(
'Suggestion type is COMPLETIONS. Start fetching for more items if partialResultToken exists.'
)
this.processRemainingRequests(languageClient, request, result, token).catch((error) => {
languageClient.warn(`Error when getting suggestions: ${error}`)
})
} else {
// Skip fetching for more items if the suggesion is EDITS. If it is EDITS suggestion, only fetching for more
// suggestions when the user start to accept a suggesion.
// Save editsStreakPartialResultToken for the next EDITS suggestion trigger if user accepts.
getLogger().info('Suggestion type is EDITS. Skip fetching for more items.')
this.sessionManager.updateActiveEditsStreakToken(result.partialResultToken)
}
} else {
// Skip fetching for more items if the suggesion is EDITS. If it is EDITS suggestion, only fetching for more
// suggestions when the user start to accept a suggesion.
// Save editsStreakPartialResultToken for the next EDITS suggestion trigger if user accepts.
getLogger().info('Suggestion type is EDITS. Skip fetching for more items.')
this.sessionManager.updateActiveEditsStreakToken(result.partialResultToken)
}
} catch (error: any) {
getLogger().error('Error getting recommendations: %O', error)
Expand Down
4 changes: 2 additions & 2 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 @@ -77,8 +77,8 @@ export class SessionManager {
this._acceptedSuggestionCount += 1
}

public updateActiveEditsStreakToken(partialResultToken?: number | string) {
if (!this.activeSession || !partialResultToken) {
public updateActiveEditsStreakToken(partialResultToken: number | string) {
if (!this.activeSession) {
return
}
this.activeSession.editsStreakPartialResultToken = partialResultToken
Expand Down
Loading