Skip to content

Commit 5abad70

Browse files
authored
Merge branch 'aws:main' into add-generate-tests
2 parents 88fb53a + b88f7d8 commit 5abad70

File tree

7 files changed

+22
-15
lines changed

7 files changed

+22
-15
lines changed

.changes/3.30.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"date" : "2024-09-27",
3+
"version" : "3.30",
4+
"entries" : [ {
5+
"type" : "bugfix",
6+
"description" : "Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings"
7+
}, {
8+
"type" : "bugfix",
9+
"description" : "Automatically terminate orphaned process for `@workspace` helper"
10+
} ]
11+
}

.changes/next-release/bugfix-79dc3ea8-07f6-4eff-ae0f-0ea0a02db7f7.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

.changes/next-release/bugfix-bc7645c1-aa53-4eaa-abac-4498255e0c19.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

.changes/next-release/feature-e16b5994-34c8-465b-b0a9-386590a7d9ea.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# _3.30_ (2024-09-27)
2+
- **(Bug Fix)** Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings
3+
- **(Bug Fix)** Automatically terminate orphaned process for `@workspace` helper
4+
15
# _3.29_ (2024-09-19)
26
- **(Feature)** Support `@workspace` queries for specific files like "`@workspace` what does test.ts do?".
37
- **(Bug Fix)** Amazon Q Feature Dev: fix iteration count messaging during code insertion

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Toolkit Version
5-
toolkitVersion=3.30-SNAPSHOT
5+
toolkitVersion=3.31-SNAPSHOT
66

77
# Publish Settings
88
publishToken=

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTr
5555
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserCancelledChatContent
5656
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserHilSelection
5757
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputChatContent
58-
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatContent
59-
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatIntroContent
6058
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSelectionSummaryChatContent
6159
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSkipTestsFlagSelectionChatContent
6260
import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserStopTransformChatContent
@@ -229,10 +227,16 @@ class CodeTransformChatController(
229227
// Publish metric to capture user selection before local build starts
230228
telemetry.submitSelection("Confirm", selection)
231229

230+
// TO-DO: delete this line when backend issue is fixed
231+
codeModernizerManager.codeTransformationSession?.let { codeModernizerManager.runLocalMavenBuild(context.project, it) }
232+
233+
// TO-DO: uncomment these lines when backend issue is fixed
234+
/*
232235
codeTransformChatHelper.run {
233236
addNewMessage(buildUserInputSkipTestsFlagChatIntroContent())
234237
addNewMessage(buildUserInputSkipTestsFlagChatContent())
235238
}
239+
*/
236240
}
237241

238242
override suspend fun processCodeTransformConfirmSkipTests(message: IncomingCodeTransformMessage.CodeTransformConfirmSkipTests) {

0 commit comments

Comments
 (0)