Merge branch 'main' into grouping-strategy

Author: ctlai95

.changes/3.51.json

@@ -0,0 +1,29 @@
+{
+  "date" : "2025-01-29",
+  "version" : "3.51",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Now the Amazon Q suggestions can co-exist with Jetbrains suggestions, with tab behavior configurable in the settings."
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q: Amazon Q inline now has configurable shortcuts for various actions including accept and browsing through suggestions."
+  }, {
+    "type" : "feature",
+    "description" : "Add setting to allow Q /dev to run code and test commands"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q: The suggestion popup will hide by default and will be displayed when the suggestion is being hovered over."
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /doc: fix open diff in a tab when another modal is open"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /test: Fixed an issue which incorrectly caused payload size exceeded exception when collecting project payload files"
+  }, {
+    "type" : "bugfix",
+    "description" : "fix(amazonq): For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix UI freeze caused by updating workspace index on non background context"
+  } ]
+}

.changes/next-release/bugfix-970b5a61-5646-4f40-b9fa-65c69ceda73f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Adds event listener for notifying UI that AB feature configurations have been resolved"
+}

.changes/next-release/feature-47353019-76fc-4dad-8816-2ee8a530312b.json

@@ -1,3 +1,13 @@
+# _3.51_ (2025-01-29)
+- **(Feature)** Amazon Q: Now the Amazon Q suggestions can co-exist with Jetbrains suggestions, with tab behavior configurable in the settings.
+- **(Feature)** Amazon Q: Amazon Q inline now has configurable shortcuts for various actions including accept and browsing through suggestions.
+- **(Feature)** Add setting to allow Q /dev to run code and test commands
+- **(Feature)** Amazon Q: The suggestion popup will hide by default and will be displayed when the suggestion is being hovered over.
+- **(Bug Fix)** Amazon Q /doc: fix open diff in a tab when another modal is open
+- **(Bug Fix)** Amazon Q /test: Fixed an issue which incorrectly caused payload size exceeded exception when collecting project payload files
+- **(Bug Fix)** fix(amazonq): For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format
+- **(Bug Fix)** Fix UI freeze caused by updating workspace index on non background context
+
 # _3.50_ (2025-01-23)
 - **(Feature)** Amazon Q: Updated `/help` command to include re:invent 2024 features
 - **(Feature)** Amazon Q: UI improvements through more accurate code syntax highlighting

.changes/next-release/feature-47e788f2-10c1-47dd-8433-3d1e0c8424ac.json

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

.changes/next-release/feature-634f17f8-0782-4c9b-a57e-0c9431eb4eb4.json

@@ -17,8 +17,8 @@ import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
-import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.core.gettingstarted.emitUserState
+import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextController
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory
@@ -36,7 +36,7 @@ class AmazonQStartupActivity : ProjectActivity {
         if (ApplicationManager.getApplication().isUnitTestMode) return
 
         ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())?.let {
-            if (it is AwsBearerTokenConnection && isInternalUser(it.startUrl)) {
+            if (it is AwsBearerTokenConnection && CodeWhispererFeatureConfigService.getInstance().getChatWSContext()) {
                 CodeWhispererSettings.getInstance().toggleProjectContextEnabled(value = true, passive = true)
             }
         }

.changes/next-release/feature-7d68dc39-493a-4a4e-9f9f-913b56ed5e5f.json

@@ -4,8 +4,10 @@
 package software.aws.toolkits.jetbrains.services.amazonqDoc.controller
 
 import com.intellij.diff.DiffContentFactory
-import com.intellij.diff.DiffManager
+import com.intellij.diff.chains.SimpleDiffRequestChain
 import com.intellij.diff.contents.EmptyContent
+import com.intellij.diff.editor.ChainDiffVirtualFile
+import com.intellij.diff.editor.DiffEditorTabFilesManager
 import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.diff.util.DiffUserDataKeys
 import com.intellij.ide.BrowserUtil
@@ -398,7 +400,8 @@ class DocController(
                     val request = SimpleDiffRequest(message.filePath, leftDiffContent, rightDiffContent, null, null)
                     request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true)
 
-                    DiffManager.getInstance().showDiff(project, request)
+                    val newDiff = ChainDiffVirtualFile(SimpleDiffRequestChain(request), message.filePath)
+                    DiffEditorTabFilesManager.getInstance(context.project).showDiffFile(newDiff, true)
                 }
             }