Merge branch 'feature/q-lsp-chat' into samgst/q-lsp-chat-disclaimer

Author: samgst-amazon

.changes/3.69.json

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-28",
+  "version" : "3.69",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt"
+  }, {
+    "type" : "removal",
+    "description" : "Removed support for 2024.1.x IDEs"
+  }, {
+    "type" : "removal",
+    "description" : "Removed support for Gateway 2024.3"
+  } ]
+}

.changes/next-release/bugfix-31222d0f-5ff2-4495-9bf2-e354eabc82c7.json

@@ -1,3 +1,10 @@
+# _3.69_ (2025-04-28)
+- **(Bug Fix)** Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE
+- **(Bug Fix)** Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments
+- **(Bug Fix)** Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt
+- **(Removal)** Removed support for 2024.1.x IDEs
+- **(Removal)** Removed support for Gateway 2024.3
+
 # _3.68_ (2025-04-23)
 - **(Feature)** Amazon Q: Show visual indicator in status bar if profile selection is needed to continue with Q Inline / Q Chat
 - **(Feature)** Amazon Q /test: Remove unsupported message for non-java python languages

.changes/next-release/bugfix-7c7e1720-545f-4b5e-8d21-511f40fabf38.json

@@ -55,7 +55,6 @@ configurations {
     // Make sure we exclude stuff we either A) ships with IDE, B) we don't use to cut down on size
     runtimeClasspath {
         exclude(group = "com.google.code.gson")
-        exclude(group = "org.slf4j", module = "slf4j-jdk14")
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
     }

.changes/next-release/removal-5979b9e4-898d-405a-9fc4-5919bb972a0e.json

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

.changes/next-release/removal-6b54ddb0-1385-4788-a225-ddae6ac958d2.json

@@ -36,6 +36,7 @@ dependencies {
     implementation(project(":plugin-amazonq:codewhisperer"))
     implementation(project(":plugin-amazonq:mynah-ui"))
     implementation(project(":plugin-amazonq:shared"))
+    implementation(libs.bundles.jackson)
     implementation(libs.lsp4j)
 
     testImplementation(project(":plugin-core"))

CHANGELOG.md

@@ -99,7 +99,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
                 override fun onProfileSelected(myProject: Project, profile: QRegionProfile?) {
                     if (project.isDisposed) return
                     AmazonQToolWindow.getInstance(project).disposeAndRecreate()
-                    qPanel.setContent(AmazonQToolWindow.getInstance(project).component)
+                    prepareChatContent(project, qPanel)
                 }
             }
         )