diff --git a/.changes/next-release/removal-296b000f-72f0-4085-b985-052c180a0089.json b/.changes/next-release/removal-296b000f-72f0-4085-b985-052c180a0089.json new file mode 100644 index 00000000000..ffaa1512ab1 --- /dev/null +++ b/.changes/next-release/removal-296b000f-72f0-4085-b985-052c180a0089.json @@ -0,0 +1,4 @@ +{ + "type" : "removal", + "description" : "Removed support for Gateway 2024.2" +} \ No newline at end of file diff --git a/.changes/next-release/removal-d4e891f5-887f-495e-9642-48bdca9df4b8.json b/.changes/next-release/removal-d4e891f5-887f-495e-9642-48bdca9df4b8.json new file mode 100644 index 00000000000..5e9765603c5 --- /dev/null +++ b/.changes/next-release/removal-d4e891f5-887f-495e-9642-48bdca9df4b8.json @@ -0,0 +1,4 @@ +{ + "type" : "removal", + "description" : "Removed support for 2023.3.x IDEs" +} \ No newline at end of file diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 9b5f3b3b5a2..9ebe77f8139 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -14,7 +14,7 @@ jobs: generate_artifact_toolkit_standalone: strategy: matrix: - supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ] + supported_versions: [ '2024.1', '2024.2', '2024.3' ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -46,7 +46,7 @@ jobs: generate_artifact_q: strategy: matrix: - supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ] + supported_versions: [ '2024.1', '2024.2', '2024.3' ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -75,7 +75,7 @@ jobs: generate_artifact_core: strategy: matrix: - supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ] + supported_versions: [ '2024.1', '2024.2', '2024.3' ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/q-mega-prerelease.yml b/.github/workflows/q-mega-prerelease.yml index 1f783a5b886..e919987d23c 100644 --- a/.github/workflows/q-mega-prerelease.yml +++ b/.github/workflows/q-mega-prerelease.yml @@ -23,7 +23,7 @@ jobs: needs: [ time ] strategy: matrix: - supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ] + supported_versions: [ '2024.1', '2024.2', '2024.3' ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -54,7 +54,7 @@ jobs: needs: [ time ] strategy: matrix: - supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ] + supported_versions: [ '2024.1', '2024.2', '2024.3' ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.run/Run AWS Toolkit - Community [2023.3].run.xml b/.run/Run AWS Toolkit - Community [2023.3].run.xml deleted file mode 100644 index cbe719f0d77..00000000000 --- a/.run/Run AWS Toolkit - Community [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Gateway [2024.2].run.xml b/.run/Run AWS Toolkit - Gateway [2024.2].run.xml deleted file mode 100644 index 43d11bc23ce..00000000000 --- a/.run/Run AWS Toolkit - Gateway [2024.2].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Rider [2023.3].run.xml b/.run/Run AWS Toolkit - Rider [2023.3].run.xml deleted file mode 100644 index 1c23b9a5d66..00000000000 --- a/.run/Run AWS Toolkit - Rider [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Ultimate [2023.3].run.xml b/.run/Run AWS Toolkit - Ultimate [2023.3].run.xml deleted file mode 100644 index 03df3e16261..00000000000 --- a/.run/Run AWS Toolkit - Ultimate [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Community [2023.3].run.xml b/.run/Run All - Community [2023.3].run.xml deleted file mode 100644 index 39c438ca72b..00000000000 --- a/.run/Run All - Community [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Rider [2023.3].run.xml b/.run/Run All - Rider [2023.3].run.xml deleted file mode 100644 index b9d5d5a683d..00000000000 --- a/.run/Run All - Rider [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Ultimate [2023.3].run.xml b/.run/Run All - Ultimate [2023.3].run.xml deleted file mode 100644 index f13a2c76785..00000000000 --- a/.run/Run All - Ultimate [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Community [2023.3].run.xml b/.run/Run Amazon Q - Community [2023.3].run.xml deleted file mode 100644 index be08ffac4cb..00000000000 --- a/.run/Run Amazon Q - Community [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Rider [2023.3].run.xml b/.run/Run Amazon Q - Rider [2023.3].run.xml deleted file mode 100644 index 9d8b125d46e..00000000000 --- a/.run/Run Amazon Q - Rider [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Ultimate [2023.3].run.xml b/.run/Run Amazon Q - Ultimate [2023.3].run.xml deleted file mode 100644 index 062a800af54..00000000000 --- a/.run/Run Amazon Q - Ultimate [2023.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/generateConfigs.py b/.run/generateConfigs.py index 4e7616b892d..d72a35612eb 100644 --- a/.run/generateConfigs.py +++ b/.run/generateConfigs.py @@ -52,7 +52,7 @@ def write_config(mv: str, ide: IdeVariant, plugin: PluginVariant): f.write(TEMPLATE.format(plugin = plugin, variant = ide, major_version = mv)) if __name__ == '__main__': - mvs = ["2023.3", "2024.1", "2024.2", "2024.3"] + mvs = ["2024.1", "2024.2", "2024.3"] ides = [ IdeVariant("Community", "IC"), IdeVariant("Rider", "RD"), 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 d0898d79f1f..491c3852570 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 @@ -142,24 +142,24 @@ object IdeVersions { Profile( name = "2024.3", gateway = ProductProfile( - sdkVersion = "243.21565-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "243.21565.196-CUSTOM-SNAPSHOT", bundledPlugins = listOf("org.jetbrains.plugins.terminal") ), community = ProductProfile( - sdkVersion = "243.21565-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "2024.3", bundledPlugins = commonPlugins + listOf( "com.intellij.java", "com.intellij.gradle", "org.jetbrains.idea.maven", ), marketplacePlugins = listOf( - "org.toml.lang:243.21565.34", - "PythonCore:243.21565.23", - "Docker:243.21565.48" + "org.toml.lang:243.21565.122", + "PythonCore:243.21565.211", + "Docker:243.21565.204" ) ), ultimate = ProductProfile( - sdkVersion = "243.21565-EAP-CANDIDATE-SNAPSHOT", + sdkVersion = "2024.3", bundledPlugins = commonPlugins + listOf( "JavaScript", "JavaScriptDebugger", @@ -167,17 +167,17 @@ object IdeVersions { "com.jetbrains.codeWithMe", ), marketplacePlugins = listOf( - "org.toml.lang:243.21565.34", - "Pythonid:243.21565.23", - "org.jetbrains.plugins.go:243.21565.23", + "org.toml.lang:243.21565.122", + "Pythonid:243.21565.211", + "org.jetbrains.plugins.go:243.21565.211", ) ), rider = RiderProfile( - sdkVersion = "2024.3-RC1-SNAPSHOT", + sdkVersion = "2024.3", bundledPlugins = commonPlugins, netFrameworkTarget = "net472", rdGenVersion = "2024.3.0", - nugetVersion = " 2024.3.0-rc01" + nugetVersion = " 2024.3.0" ) ), diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt index 5d249301c82..95fbabd3a41 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt @@ -15,7 +15,7 @@ import software.aws.toolkits.telemetry.UiTelemetry class QOpenPanelAction : AnAction(message("action.q.openchat.text"), null, AwsIcons.Logos.AWS_Q) { override fun actionPerformed(e: AnActionEvent) { - if (isRunningOnRemoteBackend() || !isQSupportedInThisVersion()) return + if (isRunningOnRemoteBackend()) return val project = e.getRequiredData(CommonDataKeys.PROJECT) UiTelemetry.click(project, "q_openChat") ToolWindowManager.getInstance(project).getToolWindow(AMAZON_Q_WINDOW_ID)?.activate(null, true) diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-233+/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformModuleUtilsTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformModuleUtilsTest.kt similarity index 100% rename from plugins/amazonq/codetransform/jetbrains-community/tst-233+/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformModuleUtilsTest.kt rename to plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformModuleUtilsTest.kt diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-233+/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformProjectUtilsTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformProjectUtilsTest.kt similarity index 100% rename from plugins/amazonq/codetransform/jetbrains-community/tst-233+/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformProjectUtilsTest.kt rename to plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformProjectUtilsTest.kt diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src-233-241/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src-241/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt similarity index 100% rename from plugins/amazonq/codewhisperer/jetbrains-community/src-233-241/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt rename to plugins/amazonq/codewhisperer/jetbrains-community/src-241/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt index 37a725cd526..24ce8c0ad9b 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt @@ -9,7 +9,6 @@ import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager import software.aws.toolkits.jetbrains.core.credentials.lazyIsUnauthedBearerConnection import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection -import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend import java.time.Instant @@ -28,6 +27,6 @@ fun isValidCodeTransformConnection(project: Project): Boolean { } fun isCodeTransformAvailable(project: Project): Boolean { if (!isIntellij()) return false - if (isRunningOnRemoteBackend() || !isQSupportedInThisVersion()) return false + if (isRunningOnRemoteBackend()) return false return isValidCodeTransformConnection(project) } diff --git a/plugins/core/jetbrains-community/src-233/com/intellij/platform/diagnostic/telemetry/helpers/UseWithoutActiveScope.kt b/plugins/core/jetbrains-community/src-233/com/intellij/platform/diagnostic/telemetry/helpers/UseWithoutActiveScope.kt deleted file mode 100644 index 688e054bfa2..00000000000 --- a/plugins/core/jetbrains-community/src-233/com/intellij/platform/diagnostic/telemetry/helpers/UseWithoutActiveScope.kt +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package com.intellij.platform.diagnostic.telemetry.helpers - -import io.opentelemetry.api.common.AttributeKey -import io.opentelemetry.api.common.Attributes -import io.opentelemetry.api.trace.Span -import io.opentelemetry.api.trace.StatusCode -import kotlin.coroutines.cancellation.CancellationException - -val EXCEPTION_ESCAPED = AttributeKey.booleanKey("exception.escaped") - -inline fun Span.useWithoutActiveScope(operation: (Span) -> T): T { - try { - return operation(this) - } catch (e: CancellationException) { - recordException(e, Attributes.of(EXCEPTION_ESCAPED, true)) - throw e - } catch (e: Throwable) { - recordException(e, Attributes.of(EXCEPTION_ESCAPED, true)) - setStatus(StatusCode.ERROR) - throw e - } finally { - end() - } -} diff --git a/plugins/core/jetbrains-community/src-233-242/software/aws/toolkits/jetbrains/PluginVersionChecker.kt b/plugins/core/jetbrains-community/src-241-242/software/aws/toolkits/jetbrains/PluginVersionChecker.kt similarity index 100% rename from plugins/core/jetbrains-community/src-233-242/software/aws/toolkits/jetbrains/PluginVersionChecker.kt rename to plugins/core/jetbrains-community/src-241-242/software/aws/toolkits/jetbrains/PluginVersionChecker.kt diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QSupportedUtil.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QSupportedUtil.kt deleted file mode 100644 index d10bc507278..00000000000 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QSupportedUtil.kt +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.services.amazonq - -import com.intellij.openapi.application.ApplicationInfo - -fun isQSupportedInThisVersion(): Boolean = ApplicationInfo.getInstance().build.asStringWithoutProductCode() !in unSupportedIdeVersionInQ - -// FIX_WHEN_MIN_IS_233: https://youtrack.jetbrains.com/issue/JBR-5850 -private val unSupportedIdeVersionInQ = listOf("232.8660.185") diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBase.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBase.kt index 402ba55fb1a..623663d85db 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBase.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBase.kt @@ -3,9 +3,7 @@ package software.aws.toolkits.jetbrains.services.telemetry.otel -import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.application.ApplicationManager -import com.intellij.platform.diagnostic.telemetry.helpers.useWithoutActiveScope import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import io.opentelemetry.api.trace.Span @@ -53,17 +51,8 @@ abstract class AbstractSpanBuilder< * @inheritdoc */ inline fun use(operation: (SpanType) -> T): T = - // FIX_WHEN_MIN_IS_241: not worth fixing for 233 - if (ApplicationInfo.getInstance().build.baselineVersion == 233) { - startSpan().useWithoutActiveScope { span -> - span.makeCurrent().use { - operation(span as SpanType) - } - } - } else { - startSpan().ijUse { span -> - operation(span as SpanType) - } + startSpan().ijUse { span -> + operation(span as SpanType) } /** diff --git a/plugins/toolkit/intellij-standalone/resources-233-241/META-INF/plugin-shim.xml b/plugins/toolkit/intellij-standalone/resources-241/META-INF/plugin-shim.xml similarity index 100% rename from plugins/toolkit/intellij-standalone/resources-233-241/META-INF/plugin-shim.xml rename to plugins/toolkit/intellij-standalone/resources-241/META-INF/plugin-shim.xml diff --git a/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/ecr/EcrPullIntegrationTest.kt b/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/ecr/EcrPullIntegrationTest.kt index 4f1b0a3c0b1..270fa99d077 100644 --- a/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/ecr/EcrPullIntegrationTest.kt +++ b/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/ecr/EcrPullIntegrationTest.kt @@ -85,7 +85,4 @@ class EcrPullIntegrationTest { assertThat(serverRuntime.agent.getImages(null).firstOrNull { it.imageId == localImageId }).isNotNull() } } - - // FIX_WHEN_MIN_IS_231: deleteImage() is blocking prior to 231 - private fun Unit.await() {} } diff --git a/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt b/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt index af8a1dc9915..56f73b10790 100644 --- a/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt +++ b/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt @@ -5,8 +5,6 @@ package software.aws.toolkits.jetbrains.services.lambda.java import com.intellij.compiler.CompilerTestUtil import com.intellij.execution.executors.DefaultDebugExecutor -import com.intellij.openapi.application.ApplicationManager -import com.intellij.testFramework.common.ThreadLeakTracker import com.intellij.testFramework.runInEdtAndWait import org.assertj.core.api.Assertions.assertThat import org.junit.After @@ -57,9 +55,6 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda @Before fun setUp() { - // FIX_WHEN_MIN_IS_241: jdk21 known offender: https://github.com/JetBrains/intellij-community/commit/1bdcfa5340969ba84c0ecf88d48f6e27d3de8a54 - ThreadLeakTracker.longRunningThreadCreated(ApplicationManager.getApplication(), "process reaper") - setSamExecutableFromEnvironment() val fixture = projectRule.fixture diff --git a/plugins/toolkit/jetbrains-core/src-233/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt b/plugins/toolkit/jetbrains-core/src-233/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt deleted file mode 100644 index 787c88a807f..00000000000 --- a/plugins/toolkit/jetbrains-core/src-233/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 -package software.aws.toolkits.jetbrains.core.explorer - -import com.intellij.openapi.actionSystem.ActionToolbar - -fun setToolbarLayout(toolbar: ActionToolbar) { - toolbar.layoutPolicy = ActionToolbar.NOWRAP_LAYOUT_POLICY -} diff --git a/plugins/toolkit/jetbrains-core/src-233-242/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt b/plugins/toolkit/jetbrains-core/src-241-242/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt similarity index 100% rename from plugins/toolkit/jetbrains-core/src-233-242/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt rename to plugins/toolkit/jetbrains-core/src-241-242/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt diff --git a/plugins/toolkit/jetbrains-core/src-233-241/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt b/plugins/toolkit/jetbrains-core/src-241/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt similarity index 100% rename from plugins/toolkit/jetbrains-core/src-233-241/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt rename to plugins/toolkit/jetbrains-core/src-241/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt diff --git a/plugins/toolkit/jetbrains-core/tst-233/software/aws/toolkits/jetbrains/utils/Compat.kt b/plugins/toolkit/jetbrains-core/tst-233/software/aws/toolkits/jetbrains/utils/Compat.kt deleted file mode 100644 index 09eeb67ddce..00000000000 --- a/plugins/toolkit/jetbrains-core/tst-233/software/aws/toolkits/jetbrains/utils/Compat.kt +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.utils - -import com.intellij.openapi.vfs.VirtualFile -import com.intellij.testFramework.runInEdtAndWait -import org.jetbrains.idea.maven.model.MavenExplicitProfiles -import org.jetbrains.idea.maven.project.MavenProjectsManager - -@Suppress("UNUSED_PARAMETER", "RedundantSuspendModifier") -suspend fun MavenProjectsManager.addManagedFilesWithProfiles( - poms: List, - profiles: MavenExplicitProfiles, - nothing: Nothing?, - nothing1: Nothing?, - nothing3: Boolean, -) { - resetManagedFilesAndProfilesInTests(poms, profiles) - runInEdtAndWait { - waitForReadingCompletion() - } -} diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/sam/JavaSamRunningStateTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/sam/JavaSamRunningStateTest.kt index 21efbe6323c..325813ad2ff 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/sam/JavaSamRunningStateTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/sam/JavaSamRunningStateTest.kt @@ -3,12 +3,10 @@ package software.aws.toolkits.jetbrains.services.lambda.execution.sam -import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.projectRoots.ProjectJdkTable import com.intellij.openapi.roots.ProjectRootManager import com.intellij.testFramework.IdeaTestUtil -import com.intellij.testFramework.common.ThreadLeakTracker import com.intellij.testFramework.runInEdtAndGet import com.intellij.testFramework.runInEdtAndWait import org.assertj.core.api.Assertions.assertThat @@ -44,9 +42,6 @@ class JavaSamRunningStateTest { projectRule.fixture credentialManager.addCredentials(mockCredsId) - // FIX_WHEN_MIN_IS_241: jdk21 known offender: https://github.com/JetBrains/intellij-community/commit/1bdcfa5340969ba84c0ecf88d48f6e27d3de8a54 - ThreadLeakTracker.longRunningThreadCreated(ApplicationManager.getApplication(), "process reaper") - val sdk = IdeaTestUtil.getMockJdk18() runInEdtAndWait { runWriteAction { diff --git a/plugins/toolkit/jetbrains-rider/resources-233/META-INF/ext-rider-wizard.xml b/plugins/toolkit/jetbrains-rider/resources-233/META-INF/ext-rider-wizard.xml deleted file mode 100644 index fdbb218c743..00000000000 --- a/plugins/toolkit/jetbrains-rider/resources-233/META-INF/ext-rider-wizard.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/core/compatability/RiderProjectTemplate.kt b/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/core/compatability/RiderProjectTemplate.kt deleted file mode 100644 index 2f59d8ea9d5..00000000000 --- a/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/core/compatability/RiderProjectTemplate.kt +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 -package software.aws.toolkits.jetbrains.core.compatability - -abstract class RiderProjectTemplate : com.jetbrains.rider.projectView.actions.projectTemplating.RiderProjectTemplate { - override val localizedGroup: String - get() = group - override val localizedName: String - get() = name -} diff --git a/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt b/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt deleted file mode 100644 index 872a5f0a543..00000000000 --- a/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.services.lambda.dotnet - -import com.intellij.openapi.module.ModuleManager -import com.intellij.openapi.progress.DumbProgressIndicator -import com.intellij.openapi.progress.ProgressManager -import com.intellij.openapi.project.rootManager -import com.intellij.openapi.util.io.FileUtil -import com.intellij.openapi.vfs.LocalFileSystem -import com.jetbrains.rider.ideaInterop.fileTypes.msbuild.CsprojFileType -import com.jetbrains.rider.projectView.SolutionManager -import com.jetbrains.rider.projectView.actions.projectTemplating.backend.ReSharperTemplatesInteraction -import com.jetbrains.rider.projectView.actions.projectTemplating.impl.ProjectTemplateDialogContext -import com.jetbrains.rider.projectView.actions.projectTemplating.impl.ProjectTemplateTransferableModel -import kotlinx.coroutines.launch -import software.aws.toolkits.jetbrains.core.coroutines.applicationCoroutineScope -import software.aws.toolkits.resources.message -import java.io.File - -class DotNetSamProjectGenerator( - private val context: ProjectTemplateDialogContext, - group: String, - categoryName: String, - model: ProjectTemplateTransferableModel, -) : DotNetSamProjectGeneratorRoot(context, group, categoryName, model) { - override fun expand() = Runnable { - val samPanel = getSamPanel() - val generator = getSamGenerator() - val samSettings = samPanel.getNewProjectSettings() - - val solutionDirectory = getSolutionDirectory() - ?: throw Exception(message("sam.init.error.no.solution.basepath")) - - val fileSystem = LocalFileSystem.getInstance() - if (!solutionDirectory.exists()) { - FileUtil.createDirectory(solutionDirectory) - } - - val outDirVf = fileSystem.refreshAndFindFileByIoFile(solutionDirectory) - ?: throw Exception(message("sam.init.error.no.virtual.file")) - - val progressManager = ProgressManager.getInstance() - val samProjectBuilder = generator.createModuleBuilder() - progressManager.runProcessWithProgressSynchronously( - { - samProjectBuilder.runSamInit( - context.project, - projectNameField.text, - samSettings, - null, - outDirVf - ) - }, - message("sam.init.generating.template"), - false, - null - ) - - // Create solution file - val projectFiles = - File(solutionDirectory, "src").walk().filter { it.extension == CsprojFileType.defaultExtension } + - File(solutionDirectory, "test").walk().filter { it.extension == CsprojFileType.defaultExtension } - - // Get the rest of generated files and copy to "SolutionItems" default folder in project structure - val solutionFiles = solutionDirectory.listFiles()?.filter { it.isFile }?.toList() ?: emptyList() - - val solutionFile = ReSharperTemplatesInteraction.createSolution( - name = getSolutionName(), - directory = solutionDirectory, - projectFiles = projectFiles.toList(), - protocolHost = context.protocolHost, - solutionFiles = solutionFiles - ) ?: throw Exception(message("sam.init.error.solution.create.fail")) - - applicationCoroutineScope().launch { - val project = - SolutionManager.openExistingSolution( - projectToClose = null, - forceOpenInNewFrame = false, - solutionFile = solutionFile, - forceConsiderTrusted = true - ) ?: return@launch - vcsPanel?.createInitializer()?.execute(project) - - val modifiableModel = ModuleManager.getInstance(project).modules.firstOrNull()?.rootManager?.modifiableModel ?: return@launch - try { - val progressIndicator = if (progressManager.hasProgressIndicator()) progressManager.progressIndicator else DumbProgressIndicator() - - samProjectBuilder.runPostSamInit(project, modifiableModel, progressIndicator, samSettings, outDirVf) - } finally { - modifiableModel.dispose() - } - } - } -} diff --git a/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt b/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt deleted file mode 100644 index 468a99a31c9..00000000000 --- a/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.services.lambda.dotnet - -import com.intellij.ui.ColorUtil -import com.intellij.ui.components.JBScrollPane -import com.intellij.ui.components.JBTabbedPane -import com.intellij.util.ui.JBUI -import com.intellij.util.ui.UIUtil -import com.intellij.xml.util.XmlUtil -import com.jetbrains.rider.ideaInterop.fileTypes.sln.SolutionFileType -import com.jetbrains.rider.projectView.actions.projectTemplating.backend.ReSharperTemplateGeneratorBase -import com.jetbrains.rider.projectView.actions.projectTemplating.impl.ProjectTemplateDialogContext -import com.jetbrains.rider.projectView.actions.projectTemplating.impl.ProjectTemplateTransferableModel -import com.jetbrains.rider.ui.themes.RiderTheme -import software.aws.toolkits.jetbrains.services.lambda.BuiltInRuntimeGroups -import software.aws.toolkits.jetbrains.services.lambda.RuntimeGroup -import software.aws.toolkits.jetbrains.services.lambda.wizard.SamInitSelectionPanel -import software.aws.toolkits.jetbrains.services.lambda.wizard.SamProjectGenerator -import software.aws.toolkits.jetbrains.utils.DotNetRuntimeUtils -import software.aws.toolkits.resources.message -import java.awt.Dimension -import java.io.File -import javax.swing.JScrollPane -import javax.swing.JTabbedPane -import javax.swing.JTextPane - -abstract class DotNetSamProjectGeneratorRoot( - private val context: ProjectTemplateDialogContext, - group: String, - categoryName: String, - model: ProjectTemplateTransferableModel, -) : ReSharperTemplateGeneratorBase( - model = model, - createSolution = true, - createProject = true, - item = context.entity -) { - companion object { - private const val SAM_HELLO_WORLD_PROJECT_NAME = "HelloWorld" - } - - // TODO: Decouple SamProjectGenerator from the framework wizards so we can re-use its panels - private val generator = SamProjectGenerator() - private val samPanel = SamInitSelectionPanel( - generator.wizardFragments, - // Only show templates for DotNet in Rider - runtimeFilter = { RuntimeGroup.getById(BuiltInRuntimeGroups.Dotnet).supportedRuntimes.contains(it) }, - // needed to rerun the validation when the wizard is changed - wizardUpdateCallback = { validateData() } - ) - - fun getSamPanel() = samPanel - - fun getSamGenerator() = generator - - private val projectStructurePanel: JTabbedPane - - private val structurePane = JTextPane().apply { - contentType = "text/html" - isEditable = false - background = RiderTheme.activeFieldBackground - border = null - } - - init { - title.labels = arrayOf(group, categoryName) - initProjectTextField() - initSamPanel() - - projectStructurePanel = JBTabbedPane() - val structureScroll = JBScrollPane(structurePane).apply { - horizontalScrollBarPolicy = JScrollPane.HORIZONTAL_SCROLLBAR_NEVER - verticalScrollBarPolicy = JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED - border = JBUI.Borders.empty() - background = UIUtil.getTextFieldBackground() - preferredSize = Dimension(1, JBUI.scale(60)) - } - - projectStructurePanel.add("Resulting project structure", structureScroll) - - updateInfo() - super.initialize() - super.layout() - - // Call this init method after super.initialize() to make sure solutionNameField override a base listener - initSolutionTextField() - - addAdditionPane(samPanel.mainPanel) - addAdditionPane(projectStructurePanel) - } - - override fun validateData() { - super.validateData() - if (validationError.value != null) { - return - } - samPanel.validate()?.let { - validationError.set(it.message) - return - } - validationError.set(null) - } - - override fun updateInfo() { - super.updateInfo() - val sep = File.separator - val builder = StringBuilder() - val font = JBUI.Fonts.label() - builder.appendLine("") - if (solutionDirectory != null && solutionDirectory != projectDirectory) { - builder.appendLine(htmlText(parentStr, "${solutionDirectory.name}${sep}src$sep${projectDirectory.name}$sep$projectFilesLabel")) - builder.appendLine(htmlText(parentStr, "${solutionDirectory.name}${sep}test$sep${projectDirectory.name}.Test$sep$projectFilesLabel")) - } else { - builder.appendLine(htmlText(parentStr, "src$sep${projectDirectory.name}$sep$projectFilesLabel")) - builder.appendLine(htmlText(parentStr, "test$sep${projectDirectory.name}.Test$sep$projectFilesLabel")) - } - } - - builder.appendLine("") - structurePane.text = builder.toString() - validateData() - } - - override fun refreshUI() { - super.refreshUI() - // This restore project name when user change a solution name and switch between templates - projectNameField.text = SAM_HELLO_WORLD_PROJECT_NAME - validationError.set(null) - validateData() - } - - private fun initSolutionTextField() { - solutionNameField.text = getPossibleName(SAM_HELLO_WORLD_PROJECT_NAME) - } - - /** - * The project name is generated inside SAM CLI generator and cannot be re-defined via parameters. - * Hardcode the project name to the generated one - "HelloWorld". - */ - private fun initProjectTextField() { - projectNameField.text = SAM_HELLO_WORLD_PROJECT_NAME - projectNameField.isEnabled = false - projectNameSetByUser = true - - sameDirectoryCheckBox.isEnabled = false - } - - private fun initSamPanel() { - samPanel.setRuntime(DotNetRuntimeUtils.getCurrentDotNetCoreRuntime()) - } - - private fun htmlText(baseDir: String, relativePath: String) = - "...$baseDir$relativePath
" -} diff --git a/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt b/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt deleted file mode 100644 index 855c1ba541c..00000000000 --- a/plugins/toolkit/jetbrains-rider/src-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.services.lambda.dotnet - -import com.jetbrains.rd.util.lifetime.Lifetime -import com.jetbrains.rd.util.reactive.IOptProperty -import com.jetbrains.rd.util.reactive.OptProperty -import com.jetbrains.rd.util.reactive.Property -import com.jetbrains.rider.projectView.actions.projectTemplating.RiderProjectTemplateGenerator -import com.jetbrains.rider.projectView.actions.projectTemplating.RiderProjectTemplateProvider -import com.jetbrains.rider.projectView.actions.projectTemplating.RiderProjectTemplateState -import com.jetbrains.rider.projectView.actions.projectTemplating.impl.ProjectTemplateDialogContext -import com.jetbrains.rider.projectView.actions.projectTemplating.impl.ProjectTemplateTransferableModel -import icons.AwsIcons -import software.aws.toolkits.jetbrains.core.compatability.RiderProjectTemplate -import software.aws.toolkits.resources.message - -class DotNetSamProjectProvider : RiderProjectTemplateProvider { - - override val isReady = Property(true) - - override fun load(lifetime: Lifetime, context: ProjectTemplateDialogContext): IOptProperty { - val state = RiderProjectTemplateState(arrayListOf(), arrayListOf()) - - state.new.add(RiderSamProject()) - return OptProperty(state) - } - - private class RiderSamProject : RiderProjectTemplate() { - - override val group = "AWS" - override val icon = AwsIcons.Resources.SERVERLESS_APP - override val name = message("sam.init.name") - - override fun createGenerator( - context: ProjectTemplateDialogContext, - transferableModel: ProjectTemplateTransferableModel, - ): RiderProjectTemplateGenerator = - DotNetSamProjectGenerator( - context = context, - group = group, - categoryName = name, - model = transferableModel - ) - - override fun getKeywords(): Array = arrayOf(name) - } -} diff --git a/plugins/toolkit/jetbrains-rider/tst-233-242/base/BaseTestWithMarkup.kt b/plugins/toolkit/jetbrains-rider/tst-241-242/base/BaseTestWithMarkup.kt similarity index 100% rename from plugins/toolkit/jetbrains-rider/tst-233-242/base/BaseTestWithMarkup.kt rename to plugins/toolkit/jetbrains-rider/tst-241-242/base/BaseTestWithMarkup.kt diff --git a/plugins/toolkit/jetbrains-rider/tst-233-242/base/BaseTestWithSolution.kt b/plugins/toolkit/jetbrains-rider/tst-241-242/base/BaseTestWithSolution.kt similarity index 100% rename from plugins/toolkit/jetbrains-rider/tst-233-242/base/BaseTestWithSolution.kt rename to plugins/toolkit/jetbrains-rider/tst-241-242/base/BaseTestWithSolution.kt diff --git a/plugins/toolkit/jetbrains-ultimate/src-233/com/jetbrains/rd/ui/bedsl/dsl/BeCompat.kt b/plugins/toolkit/jetbrains-ultimate/src-233/com/jetbrains/rd/ui/bedsl/dsl/BeCompat.kt deleted file mode 100644 index cf46f5ef5aa..00000000000 --- a/plugins/toolkit/jetbrains-ultimate/src-233/com/jetbrains/rd/ui/bedsl/dsl/BeCompat.kt +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 -package com.jetbrains.rd.ui.bedsl.dsl - -public fun com.jetbrains.ide.model.uiautomation.BeControl.withMargin( - margin: com.jetbrains.ide.model.uiautomation.BeMargin, -): com.jetbrains.ide.model.uiautomation.BeControl = - this.withMargin { - margin - } diff --git a/plugins/toolkit/jetbrains-ultimate/tst-233/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt b/plugins/toolkit/jetbrains-ultimate/tst-233/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt deleted file mode 100644 index e1c03c4ce53..00000000000 --- a/plugins/toolkit/jetbrains-ultimate/tst-233/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.go - -import com.goide.vgo.project.VgoDependency -import com.goide.vgo.project.VgoStandaloneModule -import com.intellij.openapi.project.Project -import com.intellij.openapi.vfs.VirtualFile - -object VgoCompatShims { - @JvmStatic - fun newVgoModule(project: Project, root: VirtualFile, importPath: String, goVersion: String?, dependencies: Map) = - VgoStandaloneModule(project, root, importPath, goVersion, dependencies.values) -}