Merge branch 'main' into samgst/q-lsp-token-refresh-periodic

Author: samgst-amazon

.changes/3.70.json

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-05-08",
+  "version" : "3.70",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users"
+  }, {
+    "type" : "bugfix",
+    "description" : "Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window"
+  }, {
+    "type" : "bugfix",
+    "description" : "/dev: Fix missing Amazon Q feature dev auto build setting."
+  }, {
+    "type" : "bugfix",
+    "description" : "increase /review timeout"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix JavascriptLanguage not found on 2025.1+"
+  } ]
+}

.changes/next-release/bugfix-1d632e06-24fa-40f1-a8ae-33cca0d86ec4.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix UI freezes that may occur when interacting with large files in the editor"
+}

.changes/next-release/bugfix-7e09465d-6cb8-4180-9131-7ec6543db20c.json

@@ -1,3 +1,10 @@
+# _3.70_ (2025-05-08)
+- **(Feature)** Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users
+- **(Bug Fix)** Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window
+- **(Bug Fix)** /dev: Fix missing Amazon Q feature dev auto build setting.
+- **(Bug Fix)** increase /review timeout
+- **(Bug Fix)** Fix JavascriptLanguage not found on 2025.1+
+
 # _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

CHANGELOG.md

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

gradle.properties

@@ -82,6 +82,9 @@ class GuardrailsException(operation: String, desc: String?, cause: Throwable? =
 class PromptRefusalException(operation: String, desc: String?, cause: Throwable? = null) :
     ClientException(message("amazonqFeatureDev.exception.prompt_refusal"), operation, desc, cause)
 
+class FileCreationFailedException(operation: String, desc: String?, cause: Throwable? = null) :
+    ServiceException(message("amazonqFeatureDev.exception.failed_generation"), operation, desc, cause)
+
 class ThrottlingException(operation: String, desc: String?, cause: Throwable? = null) :
     ClientException(message("amazonqFeatureDev.exception.throttling"), operation, desc, cause)
 

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

@@ -544,7 +544,8 @@ class FeatureDevController(
     }
 
     private suspend fun handleDevCommandUserSetting(tabId: String, value: Boolean) {
-        CodeWhispererSettings.getInstance().toggleAutoBuildFeature(context.project.basePath, value)
+        val session = getSessionInfo(tabId)
+        CodeWhispererSettings.getInstance().toggleAutoBuildFeature(session.context.workspaceRoot.path, value)
         messenger.sendAnswer(
             tabId = tabId,
             message = message("amazonqFeatureDev.chat_message.setting_updated"),

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

@@ -13,6 +13,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.EmptyPatchExce
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevOperation
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FileCreationFailedException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.GuardrailsException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.NoChangeRequiredException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.PromptRefusalException
@@ -261,6 +262,10 @@ private suspend fun CodeGenerationState.generateCode(
                     codeGenerationResultState.codeGenerationStatusDetail()?.contains(
                         "EmptyPatch",
                     ),
+                    -> throw FileCreationFailedException(operation = FeatureDevOperation.GenerateCode.toString(), desc = "File creation failed")
+                    codeGenerationResultState.codeGenerationStatusDetail()?.contains(
+                        "FileCreationFailed",
+                    ),
                     -> {
                         if (codeGenerationResultState.codeGenerationStatusDetail().contains("NO_CHANGE_REQUIRED")) {
                             throw NoChangeRequiredException(operation = FeatureDevOperation.GenerateCode.toString(), desc = "No change required")

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt

@@ -21,6 +21,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.psi.PsiDocumentManager
 import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
@@ -36,6 +37,7 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
+import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthNeededState
@@ -49,6 +51,8 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhisp
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererUserModificationTracker
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.getDiagnosticDifferences
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.getDocumentDiagnostics
 import software.aws.toolkits.jetbrains.services.cwc.InboundAppMessagesHandler
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.exceptions.ChatApiException
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
@@ -214,6 +218,7 @@ class ChatController private constructor(
             val caret: Caret = editor.caretModel.primaryCaret
             val offset: Int = caret.offset
 
+            val oldDiagnostics = getDocumentDiagnostics(editor.document, context.project)
             ApplicationManager.getApplication().runWriteAction {
                 WriteCommandAction.runWriteCommandAction(context.project) {
                     if (caret.hasSelection()) {
@@ -236,6 +241,12 @@ class ChatController private constructor(
                     )
                 }
             }
+            if (isInternalUser(getStartUrl(context.project))) {
+                // wait for the IDE itself to update its diagnostics for current file
+                delay(500)
+                val newDiagnostics = getDocumentDiagnostics(editor.document, context.project)
+                message.diagnosticsDifferences = getDiagnosticDifferences(oldDiagnostics, newDiagnostics)
+            }
         }
         telemetryHelper.recordInteractWithMessage(message)
 

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

@@ -270,6 +270,8 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
                     acceptedCharacterCount(message.code.length)
                     acceptedLineCount(message.code.lines().size)
                     hasProjectLevelContext(getMessageHasProjectContext(message.messageId))
+                    addedIdeDiagnostics(message.diagnosticsDifferences?.added)
+                    removedIdeDiagnostics(message.diagnosticsDifferences?.removed)
                 }.build()
             }