Merge remote-tracking branch 'upstream/main' into cwspr-inline-lang

Author: Will-ShaoHua

.changes/3.30.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2024-09-27",
+  "version" : "3.30",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings"
+  }, {
+    "type" : "bugfix",
+    "description" : "Automatically terminate orphaned process for `@workspace` helper"
+  } ]
+}

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

@@ -1,3 +1,7 @@
+# _3.30_ (2024-09-27)
+- **(Bug Fix)** Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings
+- **(Bug Fix)** Automatically terminate orphaned process for `@workspace` helper
+
 # _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

CHANGELOG.md

@@ -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/src/software/aws/toolkits/gradle/detekt/rules/BannedImportsRule.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"))

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

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

gradle.properties

@@ -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.259"
+telemetryGenerator = "1.0.262"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

gradle/libs.versions.toml

@@ -7,7 +7,7 @@
 
     <projectListeners>
         <listener class="software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowListener"
-                  topic="com.intellij.openapi.wm.ex.ToolWindowManagerListener"/>   
+                  topic="com.intellij.openapi.wm.ex.ToolWindowManagerListener"/>
         <listener class="software.aws.toolkits.jetbrains.services.cwc.editor.context.project.ProjectContextEditorListener"
                   topic="com.intellij.openapi.fileEditor.FileEditorManagerListener"/>
     </projectListeners>
@@ -70,6 +70,11 @@
                 <keyboard-shortcut keymap="$default" first-keystroke="meta alt A" />
             </action>
 
+            <action id="aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestsAction"
+                    class="software.aws.toolkits.jetbrains.services.cwc.commands.GenerateUnitTestsAction">
+                <keyboard-shortcut keymap="$default" first-keystroke="meta alt T" />
+            </action>
+
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.SendToPromptAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.SendToPromptAction">
                 <keyboard-shortcut keymap="$default" first-keystroke="meta alt S" />

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -62,7 +62,8 @@ class QGettingStartedContent(val project: Project) : Disposable {
                     AmazonQToolWindow.getStarted(project)
                 }
             }
-            null
+
+            JBCefJSQuery.Response(null)
         }
         receiveMessageQuery.addHandler(handler)
     }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt

@@ -8,9 +8,6 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.cef.CefApp
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
-import java.util.function.Function
-
-typealias MessageReceiver = Function<String, JBCefJSQuery.Response>
 
 /*
 Displays the web view for the Amazon Q tool window