Merge branch 'main' into removeMultipleDiffs

Author: dhasani23

.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/3.71.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-05-15",
+  "version" : "3.71",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Add inline completion support for abap language"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix UI freezes that may occur when interacting with large files in the editor"
+  } ]
+}

.changes/next-release/bugfix-54c0cf8a-9df5-4673-bf16-61a650434abc.json

@@ -1,3 +1,14 @@
+# _3.71_ (2025-05-15)
+- **(Feature)** Add inline completion support for abap language
+- **(Bug Fix)** Fix UI freezes that may occur when interacting with large files in the editor
+
+# _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

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

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

CHANGELOG.md

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

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)
 

gradle/libs.versions.toml

@@ -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/FeatureDevExceptions.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")