Skip to content

fix(amazonq): save previously-used JDK name #5875

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

fix(amazonq): save previously-used JDK name #5875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90758da
fix(amazonq): save previously-used JDK path
Jul 2, 2025
111d374
Merge branch 'main' into saveJdk
dhasani23 Jul 2, 2025
bea0890
Merge branch 'main' into saveJdk
dhasani23 Jul 2, 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
14 changes: 10 additions & 4 deletions ...ftware/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,16 @@ fun buildUserInputCustomDependencyVersionsChatContent(message: String) = CodeTra
type = CodeTransformChatMessageType.PendingAnswer,
)

fun buildPromptTargetJDKNameChatContent(version: String) = CodeTransformChatMessageContent(
message = message("codemodernizer.chat.message.enter_jdk_name", version),
type = CodeTransformChatMessageType.FinalizedAnswer,
)
fun buildPromptTargetJDKNameChatContent(version: String, currentJdkName: String?): CodeTransformChatMessageContent {
var message = message("codemodernizer.chat.message.enter_jdk_name", version)
if (currentJdkName != null) {
message += "\n\ncurrent: `$currentJdkName`"
}
return CodeTransformChatMessageContent(
message = message,
type = CodeTransformChatMessageType.FinalizedAnswer,
)
}

fun buildInvalidTargetJdkNameChatContent(jdkName: String) = CodeTransformChatMessageContent(
message = message("codemodernizer.chat.message.enter_jdk_name_error", jdkName),
Expand Down
8 changes: 7 additions & 1 deletion .../aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ class CodeTransformChatController(
private val codeModernizerManager = CodeModernizerManager.getInstance(context.project)
private val artifactHandler = ArtifactHandler(context.project, GumbyClient.getInstance(context.project), codeTransformChatHelper)
private val telemetry = CodeTransformTelemetryManager.getInstance(context.project)
private val jdkVersionToName = mutableMapOf<String, String>()

override suspend fun processChatPromptMessage(message: IncomingCodeTransformMessage.ChatPrompt) {
if (chatSessionStorage.getSession(message.tabId).conversationState == CodeTransformConversationState.PROMPT_TARGET_JDK_NAME) {
Expand Down Expand Up @@ -456,6 +457,10 @@ class CodeTransformChatController(
codeTransformChatHelper.addNewMessage(buildInvalidTargetJdkNameChatContent(providedJdkName))
return
}
val jdkVersion = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name
if (jdkVersion != null) {
jdkVersionToName[jdkVersion] = targetJdkName
}
codeModernizerManager.codeTransformationSession?.sessionContext?.targetJdkName = targetJdkName
codeTransformChatHelper.addNewMessage(buildUserReplyChatContent(message.message.trim()))
// start local build once we get target JDK path
Expand Down Expand Up @@ -506,7 +511,8 @@ dependencyManagement:
private suspend fun promptForTargetJdkName(tabId: String) {
chatSessionStorage.getSession(tabId).conversationState = CodeTransformConversationState.PROMPT_TARGET_JDK_NAME
val targetJdkVersion = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name.orEmpty()
codeTransformChatHelper.addNewMessage(buildPromptTargetJDKNameChatContent(targetJdkVersion))
val currentJdkName = jdkVersionToName[targetJdkVersion]
codeTransformChatHelper.addNewMessage(buildPromptTargetJDKNameChatContent(targetJdkVersion, currentJdkName))
codeTransformChatHelper.sendChatInputEnabledMessage(tabId, true)
codeTransformChatHelper.sendUpdatePlaceholderMessage(tabId, "Enter the name of your $targetJdkVersion")
}
Expand Down
Loading