From c64a6081627f76c0124cb3ce25943a2429286a7c Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Feb 2025 18:12:30 -0800 Subject: [PATCH 01/37] build(251): bump build target to eap3 --- .../toolkits/gradle/intellij/IdeVersions.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 index b5e76d4c64f..a1499fe107d 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.20015.29-EAP-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.20015.29-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" + "org.toml.lang:251.20015.44", + "PythonCore:251.20015.29", + "Docker:251.20015.29" ) ), ultimate = ProductProfile( - sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.20015.29-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -208,17 +208,17 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:251.14649.45", - "Pythonid:251.14649.49", - "org.jetbrains.plugins.go:251.14649.49", + "org.toml.lang:251.20015.44", + "Pythonid:251.20015.29", + "org.jetbrains.plugins.go:251.20015.29", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP1-SNAPSHOT", + sdkVersion = "2025.1-EAP3-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", - rdGenVersion = "2024.3.1", - nugetVersion = " 2025.1.0-eap01" + rdGenVersion = "2025.1.1", + nugetVersion = " 2025.1.0-eap03" ) ), ).associateBy { it.name } From a4b5f768809058ca8c335410a75efc0f9ad2d1f1 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Feb 2025 18:14:30 -0800 Subject: [PATCH 02/37] candidate --- .../software/aws/toolkits/gradle/intellij/IdeVersions.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index a1499fe107d..ba63b492eab 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,11 +183,11 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.20015.29-EAP-SNAPSHOT", + sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.20015.29-EAP-SNAPSHOT", + sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", @@ -200,7 +200,7 @@ object IdeVersions { ) ), ultimate = ProductProfile( - sdkVersion = "251.20015.29-EAP-SNAPSHOT", + sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", From 609da609a9636d1d87360fe68fe110268666000c Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Feb 2025 19:04:09 -0800 Subject: [PATCH 03/37] build --- .../jetbrains/uitests/TestCIServer.kt | 0 .../jetbrains/uitests/TestCIServer.kt | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+) rename ui-tests-starter/{tst-243+ => tst-243}/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt (100%) create mode 100644 ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt 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 similarity index 100% rename from ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt rename to 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 new file mode 100644 index 00000000000..5cd7458f15c --- /dev/null +++ b/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt @@ -0,0 +1,29 @@ +// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +package software.aws.toolkits.jetbrains.uitests + +import com.intellij.ide.starter.ci.CIServer +import java.nio.file.Path + +object TestCIServer : CIServer { + override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() == true + override val buildNumber: String = "" + override val branchName: String = "" + override val buildParams: Map = mapOf() + + override fun publishArtifact(source: Path, artifactPath: String, artifactName: String) { + } + + override fun reportTestFailure(testName: String, message: String, details: String, linkToLogs: String?) { + println("test: $testName") + println("message: $message") + println("details: $details") + error(message) + } + + override fun ignoreTestFailure(testName: String, message: String, details: String?) { + } + + override fun isTestFailureShouldBeIgnored(message: String) = false +} From f32b9e583eadee49f3c2629d1ded5edc2bb43d3b Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 19 Feb 2025 10:57:24 -0800 Subject: [PATCH 04/37] eap4 --- .../toolkits/gradle/intellij/IdeVersions.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 index ba63b492eab..0c06198cdf1 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.21418-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.21418.62-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.20015.44", - "PythonCore:251.20015.29", - "Docker:251.20015.29" + "org.toml.lang:251.21418.43", + "PythonCore:251.21418.62", + "Docker:251.21418.69" ) ), ultimate = ProductProfile( - sdkVersion = "251.20015-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.21418.62-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -208,17 +208,17 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:251.20015.44", - "Pythonid:251.20015.29", - "org.jetbrains.plugins.go:251.20015.29", + "org.toml.lang:251.21418.43", + "Pythonid:251.21418.62", + "org.jetbrains.plugins.go:251.21418.62", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP3-SNAPSHOT", + sdkVersion = "2025.1-EAP4-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap03" + nugetVersion = " 2025.1.0-eap04" ) ), ).associateBy { it.name } From d14f72fae6327342ec5179d4572c0b339b6d0f65 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Fri, 28 Feb 2025 09:30:58 -0800 Subject: [PATCH 05/37] eap7 --- .../toolkits/gradle/intellij/IdeVersions.kt | 22 +++++++++---------- gradle/libs.versions.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) 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 index 0c06198cdf1..f7f253e4b51 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.21418-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.21418.62-EAP-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.21418.43", - "PythonCore:251.21418.62", - "Docker:251.21418.69" + "org.toml.lang:251.23536.46", + "PythonCore:251.23536.34", + "Docker:251.23536.38" ) ), ultimate = ProductProfile( - sdkVersion = "251.21418.62-EAP-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -208,17 +208,17 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:251.21418.43", - "Pythonid:251.21418.62", - "org.jetbrains.plugins.go:251.21418.62", + "org.toml.lang:251.23536.46", + "Pythonid:251.23536.34", + "org.jetbrains.plugins.go:251.23536.34", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP4-SNAPSHOT", + sdkVersion = "2025.1-EAP6-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap04" + nugetVersion = " 2025.1.0-eap06" ) ), ).associateBy { it.name } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7ab3137a6fd..fee3608706c 100644 --- 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 /settings.gradle.kts -intellijGradle = "2.2.1" +intellijGradle = "2.3.0" intellijRemoteRobot = "0.11.22" jackson = "2.17.2" jacoco = "0.8.12" From 87fab9b4cd3cbcc0ee3345398e371e1b6b839537 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Fri, 28 Feb 2025 14:43:04 -0800 Subject: [PATCH 06/37] eap6 --- .../aws/toolkits/gradle/intellij/IdeVersions.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 index f7f253e4b51..ca434774bc6 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.22821-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.22821.72-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.23536.46", - "PythonCore:251.23536.34", - "Docker:251.23536.38" + "org.toml.lang:251.22821.73", + "PythonCore:251.22821.72", + "Docker:251.22821.72" ) ), ultimate = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.22821.72-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -209,8 +209,8 @@ object IdeVersions { ), marketplacePlugins = listOf( "org.toml.lang:251.23536.46", - "Pythonid:251.23536.34", - "org.jetbrains.plugins.go:251.23536.34", + "Pythonid:251.22821.72", + "org.jetbrains.plugins.go:251.22821.72", ) ), rider = RiderProfile( From ba7f7a544bea78261bd26f84d430297085106518 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:08:27 -0800 Subject: [PATCH 07/37] Update settings.gradle.kts --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 168f4da0a14..227833ab23b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,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 { From e29759963430b56c8bee0bdf7f4fc9dced232fb2 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 5 Mar 2025 10:52:09 -0800 Subject: [PATCH 08/37] Revert "eap6" This reverts commit 87fab9b4cd3cbcc0ee3345398e371e1b6b839537. --- .../aws/toolkits/gradle/intellij/IdeVersions.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 index ca434774bc6..f7f253e4b51 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,24 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.22821-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.22821.72-EAP-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.22821.73", - "PythonCore:251.22821.72", - "Docker:251.22821.72" + "org.toml.lang:251.23536.46", + "PythonCore:251.23536.34", + "Docker:251.23536.38" ) ), ultimate = ProductProfile( - sdkVersion = "251.22821.72-EAP-SNAPSHOT", + sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -209,8 +209,8 @@ object IdeVersions { ), marketplacePlugins = listOf( "org.toml.lang:251.23536.46", - "Pythonid:251.22821.72", - "org.jetbrains.plugins.go:251.22821.72", + "Pythonid:251.23536.34", + "org.jetbrains.plugins.go:251.23536.34", ) ), rider = RiderProfile( From a0f4f8ba4f9119604e8342035034d4592dc4a0fb Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 5 Mar 2025 16:41:19 -0800 Subject: [PATCH 09/37] ij beta / rider eap5 --- .../toolkits/gradle/intellij/IdeVersions.kt | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) 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 index f7f253e4b51..7687671bfcb 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -183,24 +183,23 @@ object IdeVersions { Profile( name = "2025.1", gateway = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:251.23536.46", - "PythonCore:251.23536.34", - "Docker:251.23536.38" + "PythonCore:251.23774.16", + "Docker:251.23774.16" ) ), ultimate = ProductProfile( - sdkVersion = "251.23536-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -208,17 +207,16 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:251.23536.46", - "Pythonid:251.23536.34", - "org.jetbrains.plugins.go:251.23536.34", + "Pythonid:251.23774.16", + "org.jetbrains.plugins.go:251.23774.16", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP6-SNAPSHOT", + sdkVersion = "2025.1-EAP5-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap06" + nugetVersion = " 2025.1.0-eap05" ) ), ).associateBy { it.name } From eb2eaad8dbc0b7121864773267f6cd587ce6535f Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Thu, 6 Mar 2025 08:40:06 -0800 Subject: [PATCH 10/37] Update IdeVersions.kt --- .../software/aws/toolkits/gradle/intellij/IdeVersions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 7687671bfcb..8856b4e853d 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -212,11 +212,11 @@ object IdeVersions { ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP5-SNAPSHOT", + sdkVersion = "2025.1-EAP7-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap05" + nugetVersion = " 2025.1.0-eap07" ) ), ).associateBy { it.name } From fbaae4133995422cf00456e0796b78f3314b24a9 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 10 Mar 2025 14:24:09 -0700 Subject: [PATCH 11/37] disable plugins --- .../src/main/kotlin/toolkit-intellij-subplugin.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts index d082e17fb33..db5b9e0ae27 100644 --- a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts +++ b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts @@ -103,6 +103,13 @@ dependencies { } } +tasks.prepareTestSandbox { + disabledPlugins = listOf( + "com.intellij.swagger", + "org.jetbrains.plugins.kotlin.jupyter", + ) +} + tasks.jar { // :plugin-toolkit:jetbrains-community results in: --plugin-toolkit-jetbrains-community-IC-.jar archiveBaseName.set(toolkitIntelliJ.ideFlavor.map { "${project.buildTreePath.replace(':', '-')}-$it" }) From 0837462433b77f52918df461597d3f6accb87edf Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 11 Mar 2025 15:23:31 -0700 Subject: [PATCH 12/37] tst --- .../aws/toolkits/jetbrains/core/docker/DockerfileParser.kt | 5 ++++- .../utils/rules/PythonCodeInsightTestFixtureRule.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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 index 9ec8bb30301..2e05b2c1b6a 100644 --- 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().lastOrNull()?.text?.substringAfter("CMD ") val portMappings = commandsAfterLastFrom.filterIsInstance().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/utils/rules/PythonCodeInsightTestFixtureRule.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt index 166de08a2db..ac166687ef3 100644 --- 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 Date: Wed, 12 Mar 2025 14:05:54 -0700 Subject: [PATCH 13/37] tst --- .../federation/psireferences/ArnPsiReferenceProviderTest.kt | 2 +- .../software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 index a5821e1e95a..986a9567929 100644 --- 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/rules/FakeCPython.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt index 56de768d2df..51cf9bba08e 100644 --- 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 } From f07221ed2bc6b586571a31cf353ff295a009044e Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Mar 2025 15:19:48 -0700 Subject: [PATCH 14/37] revert --- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8295ae92f04..4ccd180f81b 100644 --- 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 /settings.gradle.kts -intellijGradle = "2.3.0" +intellijGradle = "2.2.1" intellijRemoteRobot = "0.11.22" jackson = "2.17.2" jacoco = "0.8.12" diff --git a/settings.gradle.kts b/settings.gradle.kts index 227833ab23b..424f1fa7207 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,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.3.0" + id("org.jetbrains.intellij.platform.settings") version "2.2.1" } dependencyResolutionManagement { From 8eea824962e5e8e16dd7a5dffb5a97a44c270a3c Mon Sep 17 00:00:00 2001 From: Richard Li Date: Thu, 13 Mar 2025 10:52:49 -0700 Subject: [PATCH 15/37] 2.4.1 snapshot --- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa7b69d92c7..3575540a109 100644 --- 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 /settings.gradle.kts -intellijGradle = "2.2.1" +intellijGradle = "2.4.1-SNAPSHOT" intellijRemoteRobot = "0.11.22" jackson = "2.17.2" jacoco = "0.8.12" diff --git a/settings.gradle.kts b/settings.gradle.kts index 424f1fa7207..edaca54cdba 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,7 +29,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.2.1" + id("org.jetbrains.intellij.platform.settings") version "2.4.1-SNAPSHOT" } dependencyResolutionManagement { From 6e648bc3f83c601d367d4a9c202f7d25502af2f6 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Thu, 13 Mar 2025 11:23:04 -0700 Subject: [PATCH 16/37] snapshot repo --- settings.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index edaca54cdba..72820959ef8 100644 --- 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() } } From 44de94426fe865a84a53cae450ca7d83c2dd5240 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Thu, 13 Mar 2025 12:04:19 -0700 Subject: [PATCH 17/37] Update settings.gradle.kts --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 72820959ef8..49972755e8e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,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.4.1-SNAPSHOT" + id("org.jetbrains.intellij.platform.settings") version "2.3.0" } dependencyResolutionManagement { From 22bb421b9bc7bcfe67ac62b5d8350c064257e581 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Thu, 13 Mar 2025 12:48:38 -0700 Subject: [PATCH 18/37] Update libs.versions.toml --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3575540a109..aa7b69d92c7 100644 --- 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 /settings.gradle.kts -intellijGradle = "2.4.1-SNAPSHOT" +intellijGradle = "2.2.1" intellijRemoteRobot = "0.11.22" jackson = "2.17.2" jacoco = "0.8.12" From 4dd96b83849dbc7abe1fc560af3dbaea4eafc176 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Thu, 13 Mar 2025 12:48:59 -0700 Subject: [PATCH 19/37] Update settings.gradle.kts --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 49972755e8e..82a3a9c0714 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,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.3.0" + id("org.jetbrains.intellij.platform.settings") version "2.1.0" } dependencyResolutionManagement { From e8c1bee6ce9ba2932f30969fb19dd78272efe064 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Thu, 13 Mar 2025 13:06:05 -0700 Subject: [PATCH 20/37] Update IdeVersions.kt --- .../software/aws/toolkits/gradle/intellij/IdeVersions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 8856b4e853d..c9a97e0f92e 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -187,7 +187,7 @@ object IdeVersions { bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23774.16-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", @@ -199,7 +199,7 @@ object IdeVersions { ) ), ultimate = ProductProfile( - sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "251.23774.16-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", From b1fbc8a533225ce899a36bbc966fa1f9cb52eab6 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Thu, 13 Mar 2025 13:17:07 -0700 Subject: [PATCH 21/37] 221 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 82a3a9c0714..17555cf24b5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,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.2.1" } dependencyResolutionManagement { From cec5eb4dbd55e1f812e7ddff9324cdf44a07dec6 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 13:50:03 -0700 Subject: [PATCH 22/37] compile --- .../toolkits/gradle/intellij/IdeVersions.kt | 16 ++++++++-------- gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- .../LambdaGutterMarkHighlightingTest.kt | 2 +- settings.gradle.kts | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) 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 index c9a97e0f92e..032f86dc36c 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -187,19 +187,19 @@ object IdeVersions { bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "251.23774.16-EAP-SNAPSHOT", + sdkVersion = "251.23774.109-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "PythonCore:251.23774.16", - "Docker:251.23774.16" + "PythonCore:251.23774.109", + "Docker:251.23774.109" ) ), ultimate = ProductProfile( - sdkVersion = "251.23774.16-EAP-SNAPSHOT", + sdkVersion = "251.23774.109-EAP-SNAPSHOT", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -207,16 +207,16 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "Pythonid:251.23774.16", - "org.jetbrains.plugins.go:251.23774.16", + "Pythonid:251.23774.109", + "org.jetbrains.plugins.go:251.23774.109", ) ), rider = RiderProfile( - sdkVersion = "2025.1-EAP7-SNAPSHOT", + sdkVersion = "2025.1-EAP8-SNAPSHOT", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2025.1.1", - nugetVersion = " 2025.1.0-eap07" + nugetVersion = " 2025.1.0-eap08" ) ), ).associateBy { it.name } diff --git a/gradle.properties b/gradle.properties index aac76e7a59f..0a58eb86c31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ toolkitVersion=3.60-SNAPSHOT publishToken= publishChannel= -ideProfileName=2024.3 +ideProfileName=2025.1 remoteRobotPort=8080 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa7b69d92c7..e017dce6fed 100644 --- 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 /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 index 2c3521197d7c4586c843d1d3e9090525f1898cde..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 3990 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b415575..37f853b1c84 100644 --- 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/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 index b7f0e92a994..932ec53dd31 100644 --- 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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 17555cf24b5..49972755e8e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,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.2.1" + id("org.jetbrains.intellij.platform.settings") version "2.3.0" } dependencyResolutionManagement { From 329d915926e75cdd69996447ff4635f4b27120f0 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 14:32:47 -0700 Subject: [PATCH 23/37] hack --- plugins/toolkit/jetbrains-rider/build.gradle.kts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts index 969f37b45ff..7914090046a 100644 --- a/plugins/toolkit/jetbrains-rider/build.gradle.kts +++ b/plugins/toolkit/jetbrains-rider/build.gradle.kts @@ -370,6 +370,14 @@ tasks.integrationTest { include("**/*Test.class") } +// https://youtrack.jetbrains.com/issue/IJPL-180442 +tasks.withType { + classpath -= classpath.filter { + (it.name.startsWith("localization-") && it.name.endsWith(".jar")) + || it.name == "cwm-plugin.jar" + } +} + // fix implicit dependency on generated source tasks.withType().configureEach { dependsOn(generateModels) From edc236448a3756b034c1022f93449e6b6815e288 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 15:49:28 -0700 Subject: [PATCH 24/37] build --- .../amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts | 1 + .../importadder/CodeWhispererJSImportAdderTest.kt | 4 ++-- plugins/toolkit/jetbrains-rider/build.gradle.kts | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts b/plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts index f8df81fadfe..ca86f8c1874 100644 --- 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 index fb90662a071..a483812930e 100644 --- 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/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts index 7914090046a..7ac90777b94 100644 --- a/plugins/toolkit/jetbrains-rider/build.gradle.kts +++ b/plugins/toolkit/jetbrains-rider/build.gradle.kts @@ -373,8 +373,8 @@ tasks.integrationTest { // https://youtrack.jetbrains.com/issue/IJPL-180442 tasks.withType { classpath -= classpath.filter { - (it.name.startsWith("localization-") && it.name.endsWith(".jar")) - || it.name == "cwm-plugin.jar" + (it.name.startsWith("localization-") && it.name.endsWith(".jar")) || + it.name == "cwm-plugin.jar" } } From 2bf901e1e2e1e00a668fab7f8791462e96eed229 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 16:14:49 -0700 Subject: [PATCH 25/37] tst --- .../profiles/ProfileWatcherTest.kt | 28 +++++++++++++------ .../OfflineAmazonQInlineCompletionTest.kt | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) 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 index 2cc802d73a3..249b243c8a8 100644 --- 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,6 +12,7 @@ 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 @@ -21,6 +21,7 @@ import org.junit.rules.TemporaryFolder 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 +57,18 @@ class ProfileWatcherTest { System.getProperties().setProperty("aws.configFile", profileFile.absolutePath) System.getProperties().setProperty("aws.sharedCredentialsFile", credentialsFile.absolutePath) + + try { + assertFileChange { + profileFile.writeText("Test") + } + } catch (e: Exception) { + if (e.cause is IOException) { + throw AssumptionViolatedException("native file watcher is not executable; possibly an issue with intellij-platform-gradle-plugin", e) + } + + throw e + } } @Test @@ -106,15 +119,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/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 index b3b3f146e8c..c9aa645f050 100644 --- 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 { From f8ca37bc0d3967458820edc7488b5a6102f9e1cf Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 17:19:02 -0700 Subject: [PATCH 26/37] build / notes --- .../kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt | 2 +- buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts | 1 + .../jetbrains/core/credentials/profiles/ProfileWatcherTest.kt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 index 032f86dc36c..ef83f14e6f1 100644 --- 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", ) ), diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts index db5b9e0ae27..d68cfc55ae6 100644 --- a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts +++ b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts @@ -103,6 +103,7 @@ dependencies { } } +// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844 tasks.prepareTestSandbox { disabledPlugins = listOf( "com.intellij.swagger", 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 index 249b243c8a8..baaf0cf6e03 100644 --- 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 @@ -60,6 +60,7 @@ class ProfileWatcherTest { try { assertFileChange { + profileFile.parentFile.mkdirs() profileFile.writeText("Test") } } catch (e: Exception) { From 5c11b72fc77de31fe6c68e19a6691c1c3618c144 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 17:36:20 -0700 Subject: [PATCH 27/37] vfs --- .../software/aws/toolkits/jetbrains/utils/JavaTestUtils.kt | 4 ++++ 1 file changed, 4 insertions(+) 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 index 6ece76e6a4f..48d889b8292 100644 --- 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,10 @@ fun HeavyJavaCodeInsightTestFixtureRule.addBreakpoint() { private fun HeavyJavaCodeInsightTestFixtureRule.copyGradleFiles() { val gradleRoot = findGradlew() + + // annoying and can't repro locally + VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleRoot.toString()) + val gradleFiles = setOf("gradle/wrapper", "gradlew.bat", "gradlew") gradleFiles.forEach { From 8f0c752f1bfea6ce41b5c9ec1f7f7e617d5a7ace Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 18:06:44 -0700 Subject: [PATCH 28/37] ram / tst --- buildspec/linuxTests.yml | 5 +++++ .../core/credentials/profiles/ProfileWatcherTest.kt | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/buildspec/linuxTests.yml b/buildspec/linuxTests.yml index 8a6ce32d178..61956e24a87 100644 --- a/buildspec/linuxTests.yml +++ b/buildspec/linuxTests.yml @@ -18,6 +18,11 @@ phases: - chown -R codebuild-user:codebuild-user /codebuild/output - chown -R codebuild-user:codebuild-user /codebuild/local-cache - chown -R codebuild-user:codebuild-user /home/codebuild-user + - | + >/home/codebuild-user/gradle.properties echo " + org.gradle.jvmargs=-Xmx4096m + kotlin.daemon.jvmargs=-Xmx4096m + " - setfacl -m d:o::rwx,o::rwx /root - mkdir /tmp/testArtifacts; chmod 777 /tmp/testArtifacts - export AWS_CODEARTIFACT_NUGET_LOGFILE=/tmp/testArtifacts/codeArtifactNuGet.log 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 index baaf0cf6e03..8d977b1d177 100644 --- 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 @@ -18,6 +18,7 @@ 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 @@ -66,9 +67,10 @@ class ProfileWatcherTest { } catch (e: Exception) { if (e.cause is IOException) { throw AssumptionViolatedException("native file watcher is not executable; possibly an issue with intellij-platform-gradle-plugin", e) + } else if (e.cause !is AssertionFailedError) { + // suppress otherwise + throw e } - - throw e } } From 197e89fd31ecf8bf89e9c5da600b9b02107a2c9b Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 18:12:10 -0700 Subject: [PATCH 29/37] resolve --- .../tst/software/aws/toolkits/jetbrains/utils/JavaTestUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 48d889b8292..ff14d503e66 100644 --- 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 @@ -171,7 +171,7 @@ private fun HeavyJavaCodeInsightTestFixtureRule.copyGradleFiles() { val gradleRoot = findGradlew() // annoying and can't repro locally - VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleRoot.toString()) + VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleRoot.toRealPath().toString()) val gradleFiles = setOf("gradle/wrapper", "gradlew.bat", "gradlew") From ac296f6168c4099d49197ab0a0df6a21743611d4 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 17 Mar 2025 18:20:26 -0700 Subject: [PATCH 30/37] tst --- buildSrc/src/main/kotlin/toolkit-testing.gradle.kts | 5 +++++ plugins/toolkit/jetbrains-rider/build.gradle.kts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts b/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts index ca37a88d9c1..e813236c43f 100644 --- a/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts +++ b/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts @@ -62,6 +62,11 @@ artifacts { tasks.withType().configureEach { useJUnitPlatform() + classpath -= classpath.filter { + // pollutes test logger + it.name == "clouds-docker-impl.jar" + } + ciOnly { retry { failOnPassedAfterRetry.set(false) diff --git a/plugins/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts index 7ac90777b94..8c034c0bd14 100644 --- a/plugins/toolkit/jetbrains-rider/build.gradle.kts +++ b/plugins/toolkit/jetbrains-rider/build.gradle.kts @@ -371,7 +371,7 @@ tasks.integrationTest { } // https://youtrack.jetbrains.com/issue/IJPL-180442 -tasks.withType { +tasks.withType().configureEach { classpath -= classpath.filter { (it.name.startsWith("localization-") && it.name.endsWith(".jar")) || it.name == "cwm-plugin.jar" From 490d2c33b6f60c440fd2fa5b668e4ec6efb9d092 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 18 Mar 2025 10:45:23 -0700 Subject: [PATCH 31/37] build --- buildSrc/src/main/kotlin/toolkit-testing.gradle.kts | 5 ----- buildspec/linuxTests.yml | 10 +++++----- gradle.properties | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts b/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts index e813236c43f..ca37a88d9c1 100644 --- a/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts +++ b/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts @@ -62,11 +62,6 @@ artifacts { tasks.withType().configureEach { useJUnitPlatform() - classpath -= classpath.filter { - // pollutes test logger - it.name == "clouds-docker-impl.jar" - } - ciOnly { retry { failOnPassedAfterRetry.set(false) diff --git a/buildspec/linuxTests.yml b/buildspec/linuxTests.yml index 61956e24a87..500d934fb8f 100644 --- a/buildspec/linuxTests.yml +++ b/buildspec/linuxTests.yml @@ -13,16 +13,16 @@ 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 - chown -R codebuild-user:codebuild-user /codebuild/local-cache - chown -R codebuild-user:codebuild-user /home/codebuild-user - - | - >/home/codebuild-user/gradle.properties echo " - org.gradle.jvmargs=-Xmx4096m - kotlin.daemon.jvmargs=-Xmx4096m - " - setfacl -m d:o::rwx,o::rwx /root - mkdir /tmp/testArtifacts; chmod 777 /tmp/testArtifacts - export AWS_CODEARTIFACT_NUGET_LOGFILE=/tmp/testArtifacts/codeArtifactNuGet.log diff --git a/gradle.properties b/gradle.properties index 0a58eb86c31..44ddbea2426 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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=-Xmx2g +kotlin.daemon.jvmargs=-Xmx2g # prefer non-enterprise variant of test-retry systemProp.develocity.testretry.enabled=false From be54f8a66ffb9e1ff4720f2516c6efafabda48fb Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 18 Mar 2025 11:22:58 -0700 Subject: [PATCH 32/37] logger --- .../src/main/kotlin/toolkit-intellij-subplugin.gradle.kts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts index d68cfc55ae6..0a828e1beea 100644 --- a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts +++ b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts @@ -103,7 +103,6 @@ dependencies { } } -// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844 tasks.prepareTestSandbox { disabledPlugins = listOf( "com.intellij.swagger", @@ -117,6 +116,9 @@ tasks.jar { } tasks.withType().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") From 632707bec5da2765edb8282649cd5eb23b4b8626 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 18 Mar 2025 11:40:48 -0700 Subject: [PATCH 33/37] tst --- .../core/credentials/profiles/ProfileWatcherTest.kt | 10 +++++----- .../aws/toolkits/jetbrains/utils/JavaTestUtils.kt | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) 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 index 8d977b1d177..06616989277 100644 --- 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 @@ -63,13 +63,13 @@ class ProfileWatcherTest { assertFileChange { profileFile.parentFile.mkdirs() profileFile.writeText("Test") + profileFile.parentFile.deleteRecursively() } - } catch (e: Exception) { - if (e.cause is IOException) { + } catch (e: Error) { + 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 if (e.cause !is AssertionFailedError) { - // suppress otherwise - throw e } } } 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 index ff14d503e66..71fc3c49df3 100644 --- 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 @@ -171,7 +171,11 @@ private fun HeavyJavaCodeInsightTestFixtureRule.copyGradleFiles() { val gradleRoot = findGradlew() // annoying and can't repro locally - VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleRoot.toRealPath().toString()) + val gradleUserHome = Paths.get(System.getProperty("user.home"), ".gradle").toRealPath() + if (gradleUserHome.exists()) { + println("Allowing vfs access to $gradleUserHome") + VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleUserHome.toString()) + } val gradleFiles = setOf("gradle/wrapper", "gradlew.bat", "gradlew") From 1c4615ff805089cb2ec91ad2775b6005000f2d54 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 18 Mar 2025 13:27:21 -0700 Subject: [PATCH 34/37] tst --- .../core/credentials/profiles/ProfileWatcherTest.kt | 4 +++- .../aws/toolkits/jetbrains/utils/JavaTestUtils.kt | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) 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 index 06616989277..cc4fd97f242 100644 --- 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 @@ -65,11 +65,13 @@ class ProfileWatcherTest { profileFile.writeText("Test") profileFile.parentFile.deleteRecursively() } - } catch (e: Error) { + } 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 } } } 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 index 71fc3c49df3..0f438468b85 100644 --- 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 @@ -171,10 +171,10 @@ private fun HeavyJavaCodeInsightTestFixtureRule.copyGradleFiles() { val gradleRoot = findGradlew() // annoying and can't repro locally - val gradleUserHome = Paths.get(System.getProperty("user.home"), ".gradle").toRealPath() - if (gradleUserHome.exists()) { - println("Allowing vfs access to $gradleUserHome") - VfsRootAccess.allowRootAccess(this.fixture.testRootDisposable, gradleUserHome.toString()) + 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") From f7dea1735251d0ab56298ef60245bf70153e29dc Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 18 Mar 2025 14:00:52 -0700 Subject: [PATCH 35/37] rd --- .../services/lambda/dotnet/LambdaGutterMarkHighlightingTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 932ec53dd31..adec881650a 100644 --- 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 @@ -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) } ) From 1adafeb3a3ec039dbc53346241ce4ff129dd4b53 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 18 Mar 2025 15:10:46 -0700 Subject: [PATCH 36/37] heap --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 44ddbea2426..6359078f8b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ kotlin.code.style=official # Gradle settings org.gradle.parallel=true org.gradle.caching=true -org.gradle.jvmargs=-Xmx2g -kotlin.daemon.jvmargs=-Xmx2g +org.gradle.jvmargs=-Xmx4g +kotlin.daemon.jvmargs=-Xmx1500m -Xms500m # prefer non-enterprise variant of test-retry systemProp.develocity.testretry.enabled=false From b53dbdf62b1bb5b0ea9ac5a1395adbe9489b805b Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 18 Mar 2025 15:34:08 -0700 Subject: [PATCH 37/37] rd --- .../src/main/kotlin/toolkit-intellij-subplugin.gradle.kts | 2 +- plugins/toolkit/jetbrains-rider/build.gradle.kts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts index 0a828e1beea..ee2ae2e5a57 100644 --- a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts +++ b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts @@ -104,7 +104,7 @@ dependencies { } tasks.prepareTestSandbox { - disabledPlugins = listOf( + disabledPlugins.addAll( "com.intellij.swagger", "org.jetbrains.plugins.kotlin.jupyter", ) diff --git a/plugins/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts index 8c034c0bd14..f47398308eb 100644 --- a/plugins/toolkit/jetbrains-rider/build.gradle.kts +++ b/plugins/toolkit/jetbrains-rider/build.gradle.kts @@ -326,6 +326,11 @@ intellijPlatform { } tasks.withType().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" })