Merge branch 'main' into e2e-test

Author: Randall-Jiang

.changes/3.60.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2025-03-20",
+  "version" : "3.60",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "AmazonQ /test now displays a concise test plan summary to users."
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix inline completion failure due to context length exceeding the threshold"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix cases where content may be incorrectly excluded from workspace."
+  } ]
+}

.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-29d1b3f1-b7e6-489d-b614-49f7d908f221.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/transform: prompt user to re-authenticate if credentials expire during transformation"
+}

.changes/next-release/bugfix-2dc5d27d-f254-4462-b95c-04bccba7524e.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Gracefully handle additional fields in Amazon Q /dev code generation result without throwing errors"
+}

.changes/next-release/bugfix-7ebf9104-80a4-452e-a07a-0966078fe077.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/review: set programmingLanguage to Plaintext if language is unknown"
+}

.changes/next-release/bugfix-a9690f2d-611f-45f6-82d1-c3a9e17a6b6b.json

@@ -1,3 +1,14 @@
+# _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
+- **(Bug Fix)** Amazon Q: Fix cases where content may be incorrectly excluded from workspace.
+
 # _3.59_ (2025-03-13)
 - **(Feature)** AmazonQ /dev and /doc: Add support for complex workspaces.
 - **(Bug Fix)** /review: normalize relative file path before unzipping

.changes/next-release/bugfix-d13b5621-b191-455b-8918-1a5874216512.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(
@@ -127,7 +123,7 @@ object IdeVersions {
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:242.20224.155",
-                    "Pythonid:242.20224.300",
+                    "PythonCore:242.20224.300",
                     "org.jetbrains.plugins.go:242.20224.300",
                 )
             ),
@@ -183,42 +179,40 @@ object IdeVersions {
         Profile(
             name = "2025.1",
             gateway = ProductProfile(
-                sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = listOf("org.jetbrains.plugins.terminal")
             ),
             community = ProductProfile(
-                sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "251.23774.109-EAP-SNAPSHOT",
                 bundledPlugins = commonPlugins + listOf(
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
                 ),
                 marketplacePlugins = listOf(
-                    "org.toml.lang:251.14649.45",
-                    "PythonCore:251.14649.49",
-                    "Docker:251.14649.49"
+                    "PythonCore:251.23774.109",
+                    "Docker:251.23774.109"
                 )
             ),
             ultimate = ProductProfile(
-                sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "251.23774.109-EAP-SNAPSHOT",
                 bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
                     "JavaScriptDebugger",
                     "com.intellij.database",
                     "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
-                    "org.toml.lang:251.14649.45",
-                    "Pythonid:251.14649.49",
-                    "org.jetbrains.plugins.go:251.14649.49",
+                    "Pythonid:251.23774.109",
+                    "org.jetbrains.plugins.go:251.23774.109",
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2025.1-EAP1-SNAPSHOT",
+                sdkVersion = "2025.1-EAP8-SNAPSHOT",
                 bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
-                rdGenVersion = "2024.3.1",
-                nugetVersion = " 2025.1.0-eap01"
+                rdGenVersion = "2025.1.1",
+                nugetVersion = " 2025.1.0-eap08"
             )
         ),
     ).associateBy { it.name }

.changes/next-release/feature-862af662-3a71-4203-aa1b-bfa41af24b42.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)

CHANGELOG.md

@@ -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,12 +104,23 @@ dependencies {
     }
 }
 
+// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+tasks.withType<PrepareSandboxTask>().configureEach {
+    disabledPlugins.addAll(
+        "com.intellij.swagger",
+        "org.jetbrains.plugins.kotlin.jupyter",
+    )
+}
+
 tasks.jar {
     // :plugin-toolkit:jetbrains-community results in: --plugin-toolkit-jetbrains-community-IC-<version>.jar
     archiveBaseName.set(toolkitIntelliJ.ideFlavor.map { "${project.buildTreePath.replace(':', '-')}-$it" })
 }
 
 tasks.withType<Test>().configureEach {
+    // conflict with Docker logging impl; so bypass service loader
+    systemProperty("slf4j.provider", "org.slf4j.jul.JULServiceProvider")
+
     systemProperty("log.dir", intellijPlatform.sandboxContainer.map { "$it-test/logs" }.get())
     systemProperty("testDataPath", project.rootDir.resolve("testdata").absolutePath)
     val jetbrainsCoreTestResources = project(":plugin-toolkit:jetbrains-core").projectDir.resolve("tst-resources")

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -13,6 +13,11 @@ env:
 phases:
   install:
     commands:
+      - |
+        >/home/codebuild-user/.gradle/gradle.properties echo "
+        org.gradle.jvmargs=-Xmx4g
+        kotlin.daemon.jvmargs=-Xmx4g
+        "
       - useradd codebuild-user
       - dnf install -y acl
       - chown -R codebuild-user:codebuild-user /codebuild/output

buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts

@@ -34,10 +34,8 @@ coroutines:
   active: true
   GlobalCoroutineUsage:
     active: true
-  RedundantSuspendModifier:
-    active: true
-  SleepInsteadOfDelay:
-    active: true
+  InjectDispatcher:
+    active: false
   SuspendFunWithFlowReturnType:
     active: true
 

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -2,13 +2,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.60-SNAPSHOT
+toolkitVersion=3.62-SNAPSHOT
 
 # Publish Settings
 publishToken=
 publishChannel=
 
-ideProfileName=2024.3
+ideProfileName=2025.1
 
 remoteRobotPort=8080
 
@@ -18,8 +18,8 @@ kotlin.code.style=official
 # Gradle settings
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Xmx2048m
-kotlin.daemon.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx4g
+kotlin.daemon.jvmargs=-Xmx1500m -Xms500m
 
 # prefer non-enterprise variant of test-retry
 systemProp.develocity.testretry.enabled=false

buildspec/linuxTests.yml

@@ -10,7 +10,7 @@ detekt = "1.23.7"
 diff-util = "4.12"
 intellijExt = "1.1.8"
 # match with <root>/settings.gradle.kts
-intellijGradle = "2.2.1"
+intellijGradle = "2.3.0"
 intellijRemoteRobot = "0.11.22"
 jackson = "2.17.2"
 jacoco = "0.8.12"

detekt-rules/detekt.yml

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle.properties

@@ -24,6 +24,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter
 import software.aws.toolkits.jetbrains.settings.MeetQSettings
+import software.aws.toolkits.telemetry.MetricResult
 import software.aws.toolkits.telemetry.Telemetry
 import java.util.function.Function
 
@@ -70,6 +71,7 @@ class BrowserConnector(
                             Telemetry.toolkit.willOpenModule.use {
                                 it.module(module.asText())
                                 it.source(trigger.asText())
+                                it.result(MetricResult.Succeeded)
                             }
                         }
                     }

gradle/libs.versions.toml

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util
 
+import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.project.Project
@@ -37,6 +38,9 @@ import software.aws.toolkits.telemetry.Result
 private val logger = getLogger<FeatureDevClient>()
 
 class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project) {
+    private val objectMapper = jacksonObjectMapper()
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+
     fun createConversation(): String {
         val startTime = System.currentTimeMillis()
         var failureReason: String? = null
@@ -238,7 +242,7 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
         val parsedResult: ExportTaskAssistResultArchiveStreamResult
         try {
             val result = exportResponse.reduce { acc, next -> acc + next } // To map the result it is needed to combine the  full byte array
-            parsedResult = jacksonObjectMapper().readValue(result)
+            parsedResult = objectMapper.readValue(result)
         } catch (e: Exception) {
             logger.error(e) { "Failed to parse downloaded code results" }
             throw ExportParseException(operation = FeatureDevOperation.ExportTaskAssistArchiveResult.toString(), desc = null, e.cause)