Merge main into feature/q-lsp

aws-toolkit-automation · web-flow · commit f24037f681f7 · 2025-03-24T13:58:40.000-04:00
diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
@@ -127,7 +127,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 +183,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 }
diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
@@ -103,12 +103,22 @@ dependencies {
     }
 }
 
+tasks.prepareTestSandbox {
+    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")
diff --git a/buildspec/linuxTests.yml b/buildspec/linuxTests.yml
@@ -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
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ toolkitVersion=3.61-SNAPSHOT
 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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -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"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts b/plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     compileOnly(project(":plugin-amazonq:shared:jetbrains-ultimate"))
 
     compileOnly(project(":plugin-core:jetbrains-ultimate"))
+    testCompileOnly(project(":plugin-core:jetbrains-ultimate"))
 
     testImplementation(testFixtures(project(":plugin-amazonq:codewhisperer:jetbrains-community")))
     testImplementation(project(path = ":plugin-toolkit:jetbrains-ultimate", configuration = "testArtifacts"))
diff --git a/plugins/amazonq/codewhisperer/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/codewhisperer/importadder/CodeWhispererJSImportAdderTest.kt b/plugins/amazonq/codewhisperer/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/codewhisperer/importadder/CodeWhispererJSImportAdderTest.kt
@@ -4,13 +4,13 @@
 package software.aws.toolkits.jetbrains.services.codewhisperer.importadder
 
 import com.intellij.lang.ecmascript6.psi.ES6ImportDeclaration
-import com.intellij.lang.javascript.JavascriptLanguage
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiFileFactory
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.testFramework.runInEdtAndGet
 import com.intellij.testFramework.runInEdtAndWait
+import compat.com.intellij.lang.javascript.JavascriptLanguage
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import software.aws.toolkits.jetbrains.utils.rules.NodeJsCodeInsightTestFixtureRule
@@ -242,7 +242,7 @@ class CodeWhispererJSImportAdderTest : CodeWhispererImportAdderTestBase(
     private fun createImport(statement: String): PsiElement =
         runInEdtAndGet {
             val fileFactory = PsiFileFactory.getInstance(projectRule.project)
-            val dummyFile = fileFactory.createFileFromText("dummy.js", JavascriptLanguage.INSTANCE, statement)
+            val dummyFile = fileFactory.createFileFromText("dummy.js", JavascriptLanguage, statement)
             val importDeclarations = PsiTreeUtil.getChildrenOfType(dummyFile, ES6ImportDeclaration::class.java)
             importDeclarations?.first() ?: fail()
         }
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileWatcherTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileWatcherTest.kt
@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.core.credentials.profiles
 
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.Ref
 import com.intellij.openapi.vfs.LocalFileSystem
@@ -13,14 +12,17 @@ import com.intellij.openapi.vfs.newvfs.RefreshQueue
 import com.intellij.testFramework.ApplicationRule
 import com.intellij.testFramework.DisposableRule
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.AssumptionViolatedException
 import org.junit.Before
 import org.junit.ClassRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
+import org.opentest4j.AssertionFailedError
 import software.aws.toolkits.core.rules.SystemPropertyHelper
 import software.aws.toolkits.jetbrains.utils.spinUntil
 import java.io.File
+import java.io.IOException
 import java.time.Duration
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
@@ -56,6 +58,22 @@ class ProfileWatcherTest {
 
         System.getProperties().setProperty("aws.configFile", profileFile.absolutePath)
         System.getProperties().setProperty("aws.sharedCredentialsFile", credentialsFile.absolutePath)
+
+        try {
+            assertFileChange {
+                profileFile.parentFile.mkdirs()
+                profileFile.writeText("Test")
+                profileFile.parentFile.deleteRecursively()
+            }
+        } catch (e: Throwable) {
+            if (e is AssertionFailedError) {
+                // suppress
+            } else if (e.cause is IOException) {
+                throw AssumptionViolatedException("native file watcher is not executable; possibly an issue with intellij-platform-gradle-plugin", e)
+            } else {
+                throw e
+            }
+        }
     }
 
     @Test
@@ -106,15 +124,14 @@ class ProfileWatcherTest {
     private fun assertFileChange(block: () -> Unit) {
         val fileWatcher = (LocalFileSystem.getInstance() as LocalFileSystemImpl).fileWatcher
         Disposer.register(
-            disposableRule.disposable,
-            Disposable {
-                fileWatcher.shutdown()
+            disposableRule.disposable
+        ) {
+            fileWatcher.shutdown()
 
-                spinUntil(Duration.ofSeconds(10)) {
-                    !fileWatcher.isOperational
-                }
+            spinUntil(Duration.ofSeconds(10)) {
+                !fileWatcher.isOperational
             }
-        )
+        }
 
         val watcherTriggered = CountDownLatch(1)
         fileWatcher.startup {
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt
@@ -29,7 +29,10 @@ class DockerfileParser(private val project: Project) {
 
         val command = commandsAfterLastFrom.filterIsInstance<DockerFileCmdCommand>().lastOrNull()?.text?.substringAfter("CMD ")
         val portMappings = commandsAfterLastFrom.filterIsInstance<DockerFileExposeCommand>().mapNotNull {
-            it.listChildren().find { child -> (child as? LeafPsiElement)?.elementType?.toString() == "INTEGER_LITERAL" }?.text?.toIntOrNull()
+            it.listChildren().find { child ->
+                val elementType = (child as? LeafPsiElement)?.elementType?.toString()
+                elementType == "INTEGER_LITERAL" || elementType == "IDENTIFIER"
+            }?.text?.toIntOrNull()
         }
 
         val copyDirectives = groupByWorkDir(commandsAfterLastFrom).flatMap { (workDir, commands) ->
diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt
@@ -119,7 +119,7 @@ class ArnPsiReferenceProviderTest {
                 }
             )
 
-            assertThat(elements).hasSize(5).allSatisfy {
+            assertThat(elements).allSatisfy {
                 assertThat(it.value)
                     .withFailMessage { "Expected ArnReference with value of '$expected' from PsiElement: $it" }
                     .isEqualTo(expected)
diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/JavaTestUtils.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/JavaTestUtils.kt
@@ -169,6 +169,14 @@ fun HeavyJavaCodeInsightTestFixtureRule.addBreakpoint() {
 
 private fun HeavyJavaCodeInsightTestFixtureRule.copyGradleFiles() {
     val gradleRoot = findGradlew()
+
+    // annoying and can't repro locally
+    val gradleWrapperHome = Paths.get(System.getProperty("user.home"), ".gradle", "wrapper").toRealPath()
+    if (gradleWrapperHome.exists()) {
+        println("Allowing vfs access to $gradleWrapperHome")
+        VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleWrapperHome.toString())
+    }
+
     val gradleFiles = setOf("gradle/wrapper", "gradlew.bat", "gradlew")
 
     gradleFiles.forEach {
diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.utils.rules
 
+import com.intellij.openapi.projectRoots.Sdk
 import com.jetbrains.python.psi.LanguageLevel
 import com.jetbrains.python.sdk.flavors.CPythonSdkFlavor
 import com.jetbrains.python.sdk.flavors.PyFlavorData
@@ -13,4 +14,6 @@ internal class FakeCPython(private val languageLevel: LanguageLevel) : CPythonSd
     override fun getName(): String = "FakeCPython"
 
     override fun getVersionString(sdkHome: String?) = "$name ${languageLevel.toPythonVersion()}"
+
+    override fun getLanguageLevel(sdk: Sdk) = languageLevel
 }
diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt
@@ -118,7 +118,7 @@ internal class PlatformPythonModuleType : PythonModuleTypeBase<EmptyModuleBuilde
 }
 
 class PyTestSdk private constructor(private val version: LanguageLevel) : ProjectJdkImpl("PySdk $version", PyTestSdkType(version)) {
-    override fun getVersionString(): String = "FakeCPython $version"
+    override fun getVersionString(): String = version.toString()
 
     override fun getSdkAdditionalData(): SdkAdditionalData = PythonSdkAdditionalData(PyFlavorAndData(PyFlavorData.Empty, FakeCPython(version)))
 
diff --git a/plugins/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts
@@ -326,6 +326,11 @@ intellijPlatform {
 }
 
 tasks.withType<PrepareSandboxTask>().configureEach {
+    // com.jetbrains.rd.platform.diagnostics.BackendException:
+    // There is more than one package with the same ID JetBrains.Platform.UIInteractive.Common in the current deployed packages list.
+    // An item with the same key has already been added. Key: JetBrains.Platform.UIInteractive.Common
+    disabledPlugins.add("com.jetbrains.dotTrace.dotMemory")
+
     dependsOn(resharperDllsDir)
 
     intoChild(intellijPlatform.projectName.map { "$it/dotnet" })
@@ -370,6 +375,14 @@ tasks.integrationTest {
     include("**/*Test.class")
 }
 
+// https://youtrack.jetbrains.com/issue/IJPL-180442
+tasks.withType<Test>().configureEach {
+    classpath -= classpath.filter {
+        (it.name.startsWith("localization-") && it.name.endsWith(".jar")) ||
+            it.name == "cwm-plugin.jar"
+    }
+}
+
 // fix implicit dependency on generated source
 tasks.withType<DetektCreateBaselineTask>().configureEach {
     dependsOn(generateModels)
diff --git a/plugins/toolkit/jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/dotnet/LambdaGutterMarkHighlightingTest.kt b/plugins/toolkit/jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/dotnet/LambdaGutterMarkHighlightingTest.kt
@@ -5,8 +5,8 @@ package software.aws.toolkits.jetbrains.services.lambda.dotnet
 
 import base.BaseTestWithMarkup
 import base.backendStartTimeout
-import com.jetbrains.rdclient.testFramework.waitForDaemon
 import com.jetbrains.rider.projectView.solution
+import com.jetbrains.rider.test.scriptingApi.waitForDaemon
 import org.testng.annotations.DataProvider
 import org.testng.annotations.Test
 import software.aws.toolkits.jetbrains.protocol.awsSettingModel
@@ -172,7 +172,7 @@ class LambdaGutterMarkHighlightingTest : BaseTestWithMarkup() {
             sourceFileName = "Function.cs",
             goldFileName = "Function.gold"
         ) {
-            waitForDaemon()
+            waitForDaemon(this@LambdaGutterMarkHighlightingTest.project)
             dumpHighlightersTree(
                 valueFilter = { it.attributeId().contains(LAMBDA_RUN_MARKER_ATTRIBUTE_ID) }
             )
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,6 +21,7 @@ val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? {
     pluginManagement {
         repositories {
             it()
+            maven("https://oss.sonatype.org/content/repositories/snapshots/")
             gradlePluginPortal()
         }
     }
@@ -29,7 +30,7 @@ val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? {
 plugins {
     id("com.github.burrunan.s3-build-cache") version "1.5"
     id("com.gradle.develocity") version "3.17.6"
-    id("org.jetbrains.intellij.platform.settings") version "2.1.0"
+    id("org.jetbrains.intellij.platform.settings") version "2.3.0"
 }
 
 dependencyResolutionManagement {
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt
@@ -15,13 +15,13 @@ import com.intellij.ide.starter.models.TestCase
 import com.intellij.ide.starter.project.LocalProjectInfo
 import com.intellij.ide.starter.runner.CurrentTestMethod
 import com.intellij.ide.starter.runner.Starter
+import com.intellij.util.io.createParentDirectories
 import org.junit.jupiter.api.Test
 import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import java.io.File
 import java.nio.file.Path
 import java.nio.file.Paths
-import kotlin.io.path.createParentDirectories
 import kotlin.io.path.writeText
 
 class OfflineAmazonQInlineCompletionTest {
diff --git a/ui-tests-starter/tst-243/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-243/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt
diff --git a/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt
