Merge branch 'aws:main' into add-generate-tests

Author: bweedop

.changes/3.29.json

@@ -0,0 +1,17 @@
+{
+  "date" : "2024-09-19",
+  "version" : "3.29",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Support `@workspace` queries for specific files like \"`@workspace` what does test.ts do?\". "
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q Feature Dev: fix iteration count messaging during code insertion"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix UI slowdown when Amazon Q Inline Suggestions are enabled, but token cannot be refreshed (#4868)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix \"read access\" error that may occur when Amazon Q Inline Suggestion is building context (#4888) (#4848)"
+  } ]
+}

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

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings"
+}

CHANGELOG.md

@@ -1,3 +1,9 @@
+# _3.29_ (2024-09-19)
+- **(Feature)** Support `@workspace` queries for specific files like "`@workspace` what does test.ts do?".
+- **(Bug Fix)** Amazon Q Feature Dev: fix iteration count messaging during code insertion
+- **(Bug Fix)** Fix UI slowdown when Amazon Q Inline Suggestions are enabled, but token cannot be refreshed ([#4868](https://github.com/aws/aws-toolkit-jetbrains/issues/4868))
+- **(Bug Fix)** Fix "read access" error that may occur when Amazon Q Inline Suggestion is building context ([#4888](https://github.com/aws/aws-toolkit-jetbrains/issues/4888)) ([#4848](https://github.com/aws/aws-toolkit-jetbrains/issues/4848))
+
 # _3.28_ (2024-09-11)
 - **(Feature)** Improve workspace indexing by only index files that are changed since last indexing
 - **(Bug Fix)** Amazon Q Chat: Fixed inline code blocks are not vertically aligned with texts

detekt-rules/src/software/aws/toolkits/gradle/detekt/rules/BannedImportsRule.kt

@@ -50,6 +50,16 @@ class BannedImportsRule : Rule() {
                 )
             }
 
+            if (importedFqName?.startsWith("org.gradle.internal.impldep") == true) {
+                report(
+                    CodeSmell(
+                        issue,
+                        Entity.from(element),
+                        message = "Avoid using Gradle's internal implementation classes: not public API and may change without notice."
+                    )
+                )
+            }
+
             if (importedFqName?.contains("kotlinx.coroutines.Dispatchers") == true) {
                 report(
                     CodeSmell(

detekt-rules/tst/software/aws/toolkits/gradle/detekt/rules/BannedImportsRuleTest.kt

@@ -51,6 +51,15 @@ class BannedImportsRuleTest {
         assertThat(rule.lint("import org.assertj.core.api.Assertions.assertThat")).isEmpty()
     }
 
+    @Test
+    fun `Importing Gradle internal implementation classes fails`() {
+        assertThat(rule.lint("import org.gradle.internal.impldep"))
+            .singleElement()
+            .matches {
+                it.id == "BannedImports" && it.message == "Avoid using Gradle's internal implementation classes: not public API and may change without notice."
+            }
+    }
+
     @Test
     fun `Importing Dispatchers fails`() {
         assertThat(rule.lint("import kotlinx.coroutines.Dispatchers"))

gradle.properties

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

gradle/libs.versions.toml

@@ -25,7 +25,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.250"
+telemetryGenerator = "1.0.259"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -335,8 +335,6 @@ class FeatureDevController(
                 )
             )
 
-            // Ensure that chat input is enabled so that customers can iterate over code generation if they choose to do so
-            messenger.sendChatInputEnabledMessage(tabId = tabId, enabled = true)
             messenger.sendUpdatePlaceholder(
                 tabId = tabId,
                 newPlaceholder = message("amazonqFeatureDev.placeholder.additional_improvements")
@@ -353,7 +351,13 @@ class FeatureDevController(
     }
 
     private suspend fun newTask(tabId: String) {
-        closeSession(tabId)
+        val session = getSessionInfo(tabId)
+        val sessionLatency = System.currentTimeMillis() - session.sessionStartTime
+        AmazonqTelemetry.endChat(
+            amazonqConversationId = session.conversationId,
+            amazonqEndOfTheConversationLatency = sessionLatency.toDouble(),
+            credentialStartUrl = getStartUrl(project = context.project)
+        )
         chatSessionStorage.deleteSession(tabId)
 
         newTabOpened(tabId)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerExtensions.kt

@@ -100,13 +100,13 @@ suspend fun FeatureDevController.onCodeGeneration(session: Session, message: Str
                 tabId = tabId,
                 messageType = FeatureDevMessageType.Answer,
                 message = if (remainingIterations == 0) {
+                    message("amazonqFeatureDev.code_generation.iteration_zero")
+                } else {
                     message(
                         "amazonqFeatureDev.code_generation.iteration_counts",
                         remainingIterations,
                         totalIterations
                     )
-                } else {
-                    message("amazonqFeatureDev.code_generation.iteration_zero")
                 }
             )
         }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt

@@ -92,6 +92,10 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                     ChatMessage(tabId = tabId, triggerId = triggerId, messageId = requestId, messageType = ChatMessageType.Answer, followUps = followUps)
 
                 telemetryHelper.setResponseStreamTotalTime(tabId)
+                telemetryHelper.setResponseHasProjectContext(
+                    requestId,
+                    telemetryHelper.getIsProjectContextEnabled() && data.useRelevantDocuments && data.relevantTextDocuments.isNotEmpty()
+                )
                 telemetryHelper.recordAddMessage(data, response, responseText.length, statusCode, countTotalNumberOfCodeBlocks(responseText))
                 emit(response)
             }