From 5f2a39edeadd13d57b5976aec1a46346a8192c0d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 3 Sep 2024 02:31:36 +0900 Subject: [PATCH] [kotlin] Enable WASM target in the IDE ^KT-64984 Fixed GitOrigin-RevId: 3ec8a9c9a53635fd14d1bef605adacf9bda98716 --- .../idea/test/KmpTestConfigurationUtil.kt | 18 ------------------ .../resources/kotlin.code-insight.k2.xml | 2 +- .../WasmMultiplatformSupportAvailability.kt | 2 +- .../AbstractKotlinMppGradleImportingTest.kt | 2 -- ...tMultiplatformCodeInsightFixtureTestCase.kt | 2 -- 5 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 plugins/kotlin/base/test/test/org/jetbrains/kotlin/idea/test/KmpTestConfigurationUtil.kt diff --git a/plugins/kotlin/base/test/test/org/jetbrains/kotlin/idea/test/KmpTestConfigurationUtil.kt b/plugins/kotlin/base/test/test/org/jetbrains/kotlin/idea/test/KmpTestConfigurationUtil.kt deleted file mode 100644 index 88e9d101e483..000000000000 --- a/plugins/kotlin/base/test/test/org/jetbrains/kotlin/idea/test/KmpTestConfigurationUtil.kt +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - -package org.jetbrains.kotlin.idea.test - -import com.intellij.openapi.util.registry.Registry -import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode -import org.jetbrains.kotlin.idea.base.plugin.USE_K2_PLUGIN_PROPERTY_NAME -import org.jetbrains.kotlin.idea.base.plugin.useK2Plugin - -@TestOnly -fun T.enableKmpWasmSupport() where T : UsefulTestCase, T : ExpectedPluginModeProvider { - if (this.pluginMode == KotlinPluginMode.K2) { - check(useK2Plugin == true) { "Expected '$USE_K2_PLUGIN_PROPERTY_NAME' to be set, please set up the plugin before enabling KMP" } - Registry.get("kotlin.k2.kmp.wasm.enabled").setValue(true, testRootDisposable) - } -} diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/resources/kotlin.code-insight.k2.xml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/resources/kotlin.code-insight.k2.xml index 6f69505e3069..c1492983ed75 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/resources/kotlin.code-insight.k2.xml +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/resources/kotlin.code-insight.k2.xml @@ -132,7 +132,7 @@ diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/WasmMultiplatformSupportAvailability.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/WasmMultiplatformSupportAvailability.kt index faf29a0cf5d8..6c1c75717f06 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/WasmMultiplatformSupportAvailability.kt +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/WasmMultiplatformSupportAvailability.kt @@ -22,7 +22,7 @@ internal class WasmMultiplatformSupportAvailability : KotlinSupportAvailability true } - Registry.`is`("kotlin.k2.kmp.wasm.enabled", false) -> { + Registry.`is`("kotlin.k2.kmp.wasm.enabled", true) -> { true } diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt index 66c9f74008eb..b3b3c044fed4 100644 --- a/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/gradle/multiplatformTests/AbstractKotlinMppGradleImportingTest.kt @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.idea.codeInsight.gradle.combineMultipleFailures import org.jetbrains.kotlin.idea.codeMetaInfo.clearTextFromDiagnosticMarkup import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.jetbrains.kotlin.idea.test.KotlinTestUtils -import org.jetbrains.kotlin.idea.test.enableKmpWasmSupport import org.jetbrains.kotlin.idea.test.runAll import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.kotlin.konan.target.HostManager @@ -206,7 +205,6 @@ abstract class AbstractKotlinMppGradleImportingTest : GradleImportingTestCase(), // @Parametrized (this as GradleImportingTestCase).gradleVersion = context.gradleVersion.version super.setUp() - enableKmpWasmSupport() } context.testProject = myProject diff --git a/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightMultiplatformCodeInsightFixtureTestCase.kt b/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightMultiplatformCodeInsightFixtureTestCase.kt index c13eb6b3c052..2b3d7bb00355 100644 --- a/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightMultiplatformCodeInsightFixtureTestCase.kt +++ b/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightMultiplatformCodeInsightFixtureTestCase.kt @@ -31,8 +31,6 @@ abstract class KotlinLightMultiplatformCodeInsightFixtureTestCase : KotlinLightC override fun setUp() { super.setUp() - Registry.get("kotlin.k2.kmp.wasm.enabled").setValue(true, testRootDisposable) - // sync is necessary to detect unexpected disappearances of library files VfsTestUtil.syncRefresh() }