Skip to content

fix(amazonq): fix merge issue in QInlineCompletionProvider #5886

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 9, 2025
Merged

fix(amazonq): fix merge issue in QInlineCompletionProvider #5886

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb894f9
fix(amazonq): fix merge issue in QInlineCompletionProvider
rli Jul 9, 2025
7e81d72
lint
rli Jul 9, 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
25 changes: 11 additions & 14 deletions ...software/aws/toolkits/jetbrains/services/codewhisperer/popup/QInlineCompletionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ import kotlinx.coroutines.withContext
import migration.software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
import org.eclipse.lsp4j.jsonrpc.ResponseErrorException
import org.eclipse.lsp4j.jsonrpc.messages.Either
import software.amazon.awssdk.services.ssooidc.model.InvalidGrantException
import software.aws.toolkits.core.utils.debug
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.core.utils.warn
import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext
import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
Expand Down Expand Up @@ -601,20 +601,17 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
// https://github.com/aws/language-servers/blob/1f3e93024eeb22186a34f0bd560f8d552f517300/server/aws-lsp-codewhisperer/src/language-server/chat/utils.ts#L22-L23
// error data is nullable
if (e.responseError.data?.toString()?.contains("E_AMAZON_Q_CONNECTION_EXPIRED") == true) {
// kill the session if the connection is expired
val connection = ToolkitConnectionManager
.getInstance(project)
.activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
val tokenProvider = connection?.let { it.getConnectionSettings().tokenProvider.delegate as? BearerTokenProvider }
tokenProvider?.let {
// TODO: fragile
try {
it.refresh()
} catch (_: InvalidGrantException) {
it.invalidate()
CodeWhispererUtil.reconnectCodeWhisperer(project)
try {
// kill the session if the connection is expired
val connection = ToolkitConnectionManager
.getInstance(project)
.activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
connection?.let { it.getConnectionSettings().tokenProvider.delegate as? BearerTokenProvider }
?.invalidate()
} catch (e: Exception) {
LOG.warn(e) { "Failed to invalidate existing token in response to E_AMAZON_Q_CONNECTION_EXPIRED" }
}
}
CodeWhispererUtil.reconnectCodeWhisperer(project)
}
}
return null
Expand Down
Loading