Merge branch 'main' into plaintextfix

Author: atonaamz

.changes/3.61.json

@@ -0,0 +1,17 @@
+{
+  "date" : "2025-03-27",
+  "version" : "3.61",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Moved \"Include suggestions with code references\" setting to General"
+  }, {
+    "type" : "feature",
+    "description" : "Add support for 2025.1"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Attempt to reduce thread pool contention locking IDE caused by `@workspace` making a large number of requests"
+  }, {
+    "type" : "deprecation",
+    "description" : "An upcoming release will remove support for JetBrains Gateway version 2024.3 and for IDEs based on the 2024.1 platform"
+  } ]
+}

.changes/next-release/bugfix-e06391bd-f5ae-4c2a-a102-580d30f3be8d.json

@@ -1,3 +1,9 @@
+# _3.61_ (2025-03-27)
+- **(Feature)** Amazon Q: Moved "Include suggestions with code references" setting to General
+- **(Feature)** Add support for 2025.1
+- **(Bug Fix)** Amazon Q: Attempt to reduce thread pool contention locking IDE caused by `@workspace` making a large number of requests
+- **(Deprecation)** An upcoming release will remove support for JetBrains Gateway version 2024.3 and for IDEs based on the 2024.1 platform
+
 # _3.60_ (2025-03-20)
 - **(Feature)** AmazonQ /test now displays a concise test plan summary to users.
 - **(Bug Fix)** Fix inline completion failure due to context length exceeding the threshold

.changes/next-release/deprecation-90102050-86a4-4c19-9ecc-70c6e033b949.json

@@ -100,10 +100,6 @@ object IdeVersions {
         ),
         Profile(
             name = "2024.2",
-            gateway = ProductProfile(
-                sdkVersion = "242.23726-EAP-CANDIDATE-SNAPSHOT",
-                bundledPlugins = listOf("org.jetbrains.plugins.terminal")
-            ),
             community = ProductProfile(
                 sdkVersion = "2024.2",
                 bundledPlugins = commonPlugins + listOf(

.changes/next-release/feature-45f6e6a7-fc5b-4b14-89e2-0d9a2b138c65.json

@@ -79,6 +79,11 @@ extensions.findByType<IntelliJPlatformTestingExtension>()?.let {
         task {
             integrationTestConfiguration(this)
         }
+
+        // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+        prepareSandboxTask {
+            disabledPlugins.add("com.intellij.swagger")
+        }
     }
 } ?: run {
     val integrationTest by tasks.registering(Test::class, integrationTestConfiguration)

.changes/next-release/feature-c88b1af5-2318-4ca3-903c-a289e5494b1d.json

@@ -3,6 +3,7 @@
 
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
@@ -103,7 +104,8 @@ dependencies {
     }
 }
 
-tasks.prepareTestSandbox {
+// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+tasks.withType<PrepareSandboxTask>().configureEach {
     disabledPlugins.addAll(
         "com.intellij.swagger",
         "org.jetbrains.plugins.kotlin.jupyter",

CHANGELOG.md

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