Skip to content

refactor: cleanup old nep code path which is no longered being used @codewhispererServer.ts #2141

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
Aug 19, 2025
Merged

refactor: cleanup old nep code path which is no longered being used @codewhispererServer.ts #2141

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
124 changes: 44 additions & 80 deletions server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,93 +468,57 @@ export const CodewhispererServerFactory =
return false
})

if (suggestionResponse.suggestionType === SuggestionType.COMPLETION) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

remove this if check since it will always be "COMPLETION"

const { includeImportsWithSuggestions } = amazonQServiceManager.getConfiguration()
const suggestionsWithRightContext = mergeSuggestionsWithRightContext(
session.requestContext.fileContext.rightFileContent,
filteredSuggestions,
includeImportsWithSuggestions,
selectionRange
).filter(suggestion => {
// Discard suggestions that have empty string insertText after right context merge and can't be displayed anymore
if (suggestion.insertText === '') {
session.setSuggestionState(suggestion.itemId, 'Discard')
return false
}

return true
})

suggestionsWithRightContext.forEach(suggestion => {
const cachedSuggestion = session.suggestions.find(s => s.itemId === suggestion.itemId)
if (cachedSuggestion) cachedSuggestion.insertText = suggestion.insertText.toString()
})
const { includeImportsWithSuggestions } = amazonQServiceManager.getConfiguration()
const suggestionsWithRightContext = mergeSuggestionsWithRightContext(
session.requestContext.fileContext.rightFileContent,
filteredSuggestions,
includeImportsWithSuggestions,
selectionRange
).filter(suggestion => {
// Discard suggestions that have empty string insertText after right context merge and can't be displayed anymore
if (suggestion.insertText === '') {
session.setSuggestionState(suggestion.itemId, 'Discard')
return false
}

// TODO: need dedupe after right context merging but I don't see one
session.suggestionsAfterRightContextMerge.push(...suggestionsWithRightContext)
return true
})

session.codewhispererSuggestionImportCount =
session.codewhispererSuggestionImportCount +
suggestionsWithRightContext.reduce((total, suggestion) => {
return total + (suggestion.mostRelevantMissingImports?.length || 0)
}, 0)
suggestionsWithRightContext.forEach(suggestion => {
const cachedSuggestion = session.suggestions.find(s => s.itemId === suggestion.itemId)
if (cachedSuggestion) cachedSuggestion.insertText = suggestion.insertText.toString()
})

// If after all server-side filtering no suggestions can be displayed, and there is no nextToken
// close session and return empty results
if (
session.suggestionsAfterRightContextMerge.length === 0 &&
!suggestionResponse.responseContext.nextToken
) {
completionSessionManager.closeSession(session)
await emitUserTriggerDecisionTelemetry(
telemetry,
telemetryService,
session,
timeSinceLastUserModification
)
// TODO: need dedupe after right context merging but I don't see one
session.suggestionsAfterRightContextMerge.push(...suggestionsWithRightContext)

return EMPTY_RESULT
}
session.codewhispererSuggestionImportCount =
session.codewhispererSuggestionImportCount +
suggestionsWithRightContext.reduce((total, suggestion) => {
return total + (suggestion.mostRelevantMissingImports?.length || 0)
}, 0)

return {
items: suggestionsWithRightContext,
sessionId: session.id,
partialResultToken: suggestionResponse.responseContext.nextToken,
}
} else {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

remove this else

return {
items: suggestionResponse.suggestions
.map(suggestion => {
// Check if this suggestion is similar to a previously rejected edit
const isSimilarToRejected = rejectedEditTracker.isSimilarToRejected(
suggestion.content,
textDocument?.uri || ''
)
// If after all server-side filtering no suggestions can be displayed, and there is no nextToken
// close session and return empty results
if (
session.suggestionsAfterRightContextMerge.length === 0 &&
!suggestionResponse.responseContext.nextToken
) {
completionSessionManager.closeSession(session)
await emitUserTriggerDecisionTelemetry(
telemetry,
telemetryService,
session,
timeSinceLastUserModification
)

if (isSimilarToRejected) {
// Mark as rejected in the session
session.setSuggestionState(suggestion.itemId, 'Reject')
logging.debug(
`[EDIT_PREDICTION] Filtered out suggestion similar to previously rejected edit`
)
// Return empty item that will be filtered out
return {
insertText: '',
isInlineEdit: true,
itemId: suggestion.itemId,
}
}
return EMPTY_RESULT
}

return {
insertText: suggestion.content,
isInlineEdit: true,
itemId: suggestion.itemId,
}
})
.filter(item => item.insertText !== ''),
sessionId: session.id,
partialResultToken: suggestionResponse.responseContext.nextToken,
}
return {
items: suggestionsWithRightContext,
sessionId: session.id,
partialResultToken: suggestionResponse.responseContext.nextToken,
}
}

Expand Down
Loading