Merge remote-tracking branch 'upstream/main' into client

Author: Will-ShaoHua

.changes/3.54.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-02-11",
+  "version" : "3.54",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Reverting the behavior of making JetBrains suggestions(IntelliSense) and Q suggestions co-exist"
+  } ]
+}

.changes/next-release/bugfix-3b7843b4-9673-4afa-90e8-7c4278f0d0fe.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Enable syntax highlighting when viewing diff for /test"
+}

.changes/next-release/bugfix-47911d01-4571-42a5-b447-d443910e8aee.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /test: Truncating user input to 4096 characters for unit test generation."
+}

.changes/next-release/bugfix-62042604-3335-445b-90f6-d6f688087c9d.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /test: Q identify active test file and infer source file for test generation."
+}

.github/workflows/prerelease.yml

@@ -17,7 +17,7 @@ jobs:
   generate_artifact_toolkit_standalone:
     strategy:
       matrix:
-        supported_versions: [ '2024.1', '2024.2', '2024.3' ]
+        supported_versions: [ '2024.1', '2024.2', '2024.3', '2025.1' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -1,3 +1,6 @@
+# _3.54_ (2025-02-11)
+- **(Bug Fix)** Amazon Q: Reverting the behavior of making JetBrains suggestions(IntelliSense) and Q suggestions co-exist
+
 # _3.53_ (2025-02-07)
 - **(Bug Fix)** Amazon Q: Fixed an issue where in a specific scenario when receiving multiple suggestions with JetBrains suggestions visible, users are not able to accept the suggestion.
 

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.54-SNAPSHOT
+toolkitVersion=3.55-SNAPSHOT
 
 # Publish Settings
 publishToken=

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/clients/AmazonQCodeGenerateClient.kt

@@ -13,7 +13,8 @@ import software.amazon.awssdk.services.codewhispererruntime.model.ContentChecksu
 import software.amazon.awssdk.services.codewhispererruntime.model.CreateTaskAssistConversationRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.CreateTaskAssistConversationResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.CreateUploadUrlResponse
-import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationEvent
+import software.amazon.awssdk.services.codewhispererruntime.model.DocV2AcceptanceEvent
+import software.amazon.awssdk.services.codewhispererruntime.model.DocV2GenerationEvent
 import software.amazon.awssdk.services.codewhispererruntime.model.GetTaskAssistCodeGenerationResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory
 import software.amazon.awssdk.services.codewhispererruntime.model.OperatingSystem
@@ -49,7 +50,7 @@ class AmazonQCodeGenerateClient(private val project: Project) {
             OptOutPreference.OPTOUT
         }
 
-    private val docGenerationUserContext = ClientMetadata.getDefault().let {
+    private val docUserContext = ClientMetadata.getDefault().let {
         val osForFeatureDev: OperatingSystem =
             when {
                 SystemInfo.isWindows -> OperatingSystem.WINDOWS
@@ -75,15 +76,17 @@ class AmazonQCodeGenerateClient(private val project: Project) {
     private val amazonQStreamingClient
         get() = AmazonQStreamingClient.getInstance(project)
 
-    fun sendDocGenerationTelemetryEvent(
-        docGenerationEvent: DocGenerationEvent,
+    fun sendDocTelemetryEvent(
+        generationEvent: DocV2GenerationEvent? = null,
+        acceptanceEvent: DocV2AcceptanceEvent? = null,
     ): SendTelemetryEventResponse =
         bearerClient().sendTelemetryEvent { requestBuilder ->
             requestBuilder.telemetryEvent { telemetryEventBuilder ->
-                telemetryEventBuilder.docGenerationEvent(docGenerationEvent)
+                generationEvent?.let { telemetryEventBuilder.docV2GenerationEvent(it) }
+                acceptanceEvent?.let { telemetryEventBuilder.docV2AcceptanceEvent(it) }
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())
-            requestBuilder.userContext(docGenerationUserContext)
+            requestBuilder.userContext(docUserContext)
         }
 
     fun createTaskAssistConversation(): CreateTaskAssistConversationResponse = bearerClient().createTaskAssistConversation(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt

@@ -59,6 +59,7 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.IOException
+import java.nio.file.Path
 import java.nio.file.Paths
 import java.time.Duration
 import java.time.Instant
@@ -249,9 +250,10 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     if (shortAnswer.stopIteration == "true") {
                         throw CodeTestException("TestGenFailedError: ${shortAnswer.planSummary}", "TestGenFailedError", shortAnswer.planSummary)
                     }
+                    val fileName = shortAnswer.sourceFilePath?.let { Path.of(it).fileName.toString() } ?: path.fileName.toString()
                     codeTestChatHelper.updateAnswer(
                         CodeTestChatMessageContent(
-                            message = generateSummaryMessage(path.fileName.toString()) + shortAnswer.planSummary,
+                            message = generateSummaryMessage(fileName) + shortAnswer.planSummary,
                             type = ChatMessageType.Answer
                         ),
                         messageIdOverride = codeTestResponseContext.testSummaryMessageId

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -201,12 +201,11 @@ class CodeTestChatController(
 
             session.isCodeBlockSelected = selectionRange !== null
 
-            // This check is added to remove /test if user accidentally added while doing Regenerate unit tests.
-            val userPrompt = if (message.prompt.startsWith("/test")) {
-                message.prompt.substringAfter("/test ").trim()
-            } else {
-                message.prompt
-            }
+            // This removes /test if user accidentally added while doing Regenerate unit tests and truncates the user response to 4096 characters.
+            val userPrompt = message.prompt
+                .let { if (it.startsWith("/test")) it.substringAfter("/test ").trim() else it }
+                .take(4096)
+
             CodeWhispererUTGChatManager.getInstance(project).generateTests(userPrompt, codeTestChatHelper, null, selectionRange)
         } else {
             // Not adding a progress bar to unsupported language cases
@@ -458,6 +457,10 @@ class CodeTestChatController(
         when (message.actionID) {
             "utg_view_diff" -> {
                 withContext(EDT) {
+                    // virtual file only needed for syntax highlighting when viewing diff
+                    val tempPath = Files.createTempFile(null, ".${session.testFileName.substringAfterLast('.')}")
+                    val virtualFile = tempPath.toFile().toVirtualFile()
+
                     (DiffManager.getInstance() as DiffManagerEx).showDiffBuiltin(
                         context.project,
                         SimpleDiffRequest(
@@ -466,13 +469,18 @@ class CodeTestChatController(
                                 getFileContentAtTestFilePath(
                                     session.projectRoot,
                                     session.testFileRelativePathToProjectRoot
-                                )
+                                ),
+                                virtualFile
+                            ),
+                            DiffContentFactory.getInstance().create(
+                                session.generatedTestDiffs.values.first(),
+                                virtualFile
                             ),
-                            DiffContentFactory.getInstance().create(session.generatedTestDiffs.values.first()),
                             "Before",
                             "After"
                         )
                     )
+                    Files.deleteIfExists(tempPath)
                     session.openedDiffFile = FileEditorManager.getInstance(context.project).selectedEditor?.file
                     ApplicationManager.getApplication().runReadAction {
                         generatedFileContent = getGeneratedFileContent(session)