diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/platform/CommonPlatforms.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/platform/CommonPlatforms.kt index 6eaa3195107..2255c9da396 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/platform/CommonPlatforms.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/platform/CommonPlatforms.kt @@ -8,8 +8,7 @@ package org.jetbrains.kotlin.platform import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.js.JsPlatforms.defaultJsPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatforms -import org.jetbrains.kotlin.platform.jvm.JvmPlatforms.defaultJvmPlatform -import org.jetbrains.kotlin.platform.jvm.JvmPlatforms.jvm18 +import org.jetbrains.kotlin.platform.jvm.JvmPlatforms.unspecifiedJvmPlatform import org.jetbrains.kotlin.platform.konan.KonanPlatforms import org.jetbrains.kotlin.platform.konan.KonanPlatforms.defaultKonanPlatform @@ -17,12 +16,12 @@ import org.jetbrains.kotlin.platform.konan.KonanPlatforms.defaultKonanPlatform object CommonPlatforms { @Deprecated( - message = "Should be accessed only by compatibility layer, other clients should use 'defaultJvmPlatform'", + message = "Should be accessed only by compatibility layer, other clients should use 'unspecifiedJvmPlatform'", level = DeprecationLevel.ERROR ) object CompatCommonPlatform : TargetPlatform( setOf( - defaultJvmPlatform.single(), + unspecifiedJvmPlatform.single(), defaultJsPlatform.single(), defaultKonanPlatform.single() ) diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt index 0bfe68858a3..524c127335d 100644 --- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsSmokeTest.kt @@ -138,7 +138,7 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() { when { nameSuffix.isEmpty() -> null // TODO(dsavvinov): this leads to 'null'-platform in ModuleDescriptor nameSuffix == "COMMON" -> CommonPlatforms.defaultCommonPlatform - nameSuffix == "JVM" -> JvmPlatforms.defaultJvmPlatform // TODO(dsavvinov): determine JvmTarget precisely + nameSuffix == "JVM" -> JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): determine JvmTarget precisely nameSuffix == "JS" -> JsPlatforms.defaultJsPlatform nameSuffix == "NATIVE" -> KonanPlatforms.defaultKonanPlatform else -> throw IllegalStateException("Can't determine platform by name $nameSuffix") @@ -148,7 +148,7 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() { class BuiltInModuleInfo(override val name: Name) : ModuleInfo { override val platform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform + get() = JvmPlatforms.unspecifiedJvmPlatform override val analyzerServices: PlatformDependentAnalyzerServices get() = JvmPlatformAnalyzerServices @@ -160,7 +160,7 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() { protected class TestModuleInfo(override val name: Name) : ModuleInfo { override val platform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform + get() = JvmPlatforms.unspecifiedJvmPlatform override val analyzerServices: PlatformDependentAnalyzerServices get() = JvmPlatformAnalyzerServices diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt index ac2c3ccee4e..5148586f34e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/platform/jvm/JvmPlatform.kt @@ -22,8 +22,13 @@ object JvmPlatforms { private val jvmTargetToJdkPlatform: Map = JvmTarget.values().map { it to JdkPlatform(it).toTargetPlatform() }.toMap() - val defaultJvmPlatform: TargetPlatform - get() = CompatJvmPlatform + // This platform is needed mostly for compatibility and migration of code base, + // as previously some clients used TargetPlatform just as platform-marker + // and didn't care about particular jvmTarget. + // TODO(dsavvinov): review all usages and choose proper JvmTarget + val unspecifiedJvmPlatform: TargetPlatform = CompatJvmPlatform + + val defaultJvmPlatform: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.DEFAULT]!! val jvm16: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_1_6]!! val jvm18: TargetPlatform = jvmTargetToJdkPlatform[JvmTarget.JVM_1_8]!! @@ -34,7 +39,7 @@ object JvmPlatforms { val allJvmPlatforms: List = jvmTargetToJdkPlatform.values.toList() @Deprecated( - message = "Should be accessed only by compatibility layer, other clients should use 'defaultJvmPlatform'", + message = "Should be accessed only by compatibility layer, other clients should use 'unspecifiedJvmPlatform'", level = DeprecationLevel.ERROR ) object CompatJvmPlatform : TargetPlatform(setOf(UNSPECIFIED_SIMPLE_JVM_PLATFORM)), diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt index ac8448ec3bc..4ac6d9d84dc 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.resolve.TargetPlatform @Deprecated( message = "This class is deprecated and will be removed soon, use API from 'org.jetbrains.kotlin.platform.*' packages instead", - replaceWith = ReplaceWith("JvmPlatforms.defaultJvmPlatform", "org.jetbrains.kotlin.platform.jvm.JvmPlatforms"), + replaceWith = ReplaceWith("JvmPlatforms.unspecifiedJvmPlatform", "org.jetbrains.kotlin.platform.jvm.JvmPlatforms"), level = DeprecationLevel.ERROR ) interface JvmPlatform : TargetPlatform { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt index 83b8442476b..c1375b9fd97 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt @@ -594,7 +594,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() { when { nameSuffix.isEmpty() -> null // TODO(dsavvinov): this leads to 'null'-platform in ModuleDescriptor nameSuffix == "COMMON" -> CommonPlatforms.defaultCommonPlatform - nameSuffix == "JVM" -> JvmPlatforms.defaultJvmPlatform // TODO(dsavvinov): determine JvmTarget precisely + nameSuffix == "JVM" -> JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): determine JvmTarget precisely nameSuffix == "JS" -> JsPlatforms.defaultJsPlatform nameSuffix == "NATIVE" -> KonanPlatforms.defaultKonanPlatform else -> throw IllegalStateException("Can't determine platform by name $nameSuffix") diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestModuleInfo.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestModuleInfo.kt index f0a9e72a665..ea62acd7e98 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestModuleInfo.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestModuleInfo.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices class FirTestModuleInfo( override val name: Name = Name.identifier("TestModule"), val dependencies: MutableList = mutableListOf(), - override val platform: TargetPlatform = JvmPlatforms.defaultJvmPlatform, + override val platform: TargetPlatform = JvmPlatforms.unspecifiedJvmPlatform, override val analyzerServices: PlatformDependentAnalyzerServices = JvmPlatformAnalyzerServices ) : ModuleInfo { override fun dependencies(): List = dependencies diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt index ed5cff37425..e0a8c908d78 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt @@ -67,7 +67,7 @@ private class TestModule(val dependsOnBuiltIns: Boolean) : ModuleInfo { ModuleInfo.DependencyOnBuiltIns.NONE override val platform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform + get() = JvmPlatforms.unspecifiedJvmPlatform override val analyzerServices: PlatformDependentAnalyzerServices get() = JvmPlatformAnalyzerServices diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index d4389a080c9..2274d7fb640 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -62,7 +62,7 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() { override val name = Name.special("<$_name>") override val platform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform + get() = JvmPlatforms.unspecifiedJvmPlatform override val analyzerServices: PlatformDependentAnalyzerServices get() = JvmPlatformAnalyzerServices diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt index fa97db95c00..50a06ee7fcf 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt @@ -362,7 +362,7 @@ data class SdkInfo(val project: Project, val sdk: Sdk) : IdeaModuleInfo { override fun dependencies(): List = listOf(this) override val platform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform // TODO(dsavvinov): provide proper target version + get() = JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): provide proper target version override val analyzerServices: PlatformDependentAnalyzerServices get() = JvmPlatformAnalyzerServices diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt index 2c3ab2ebb6e..7ee04c45b66 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt @@ -51,7 +51,7 @@ data class ScriptModuleInfo( } override val platform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform // TODO(dsavvinov): choose proper target version + get() = JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): choose proper target version override val analyzerServices: PlatformDependentAnalyzerServices get() = JvmPlatformAnalyzerServices @@ -77,7 +77,7 @@ sealed class ScriptDependenciesInfo(val project: Project) : IdeaModuleInfo, Bina get() = ScriptDependenciesSourceInfo.ForProject(project) override val platform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform // TODO(dsavvinov): choose proper TargetVersion + get() = JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): choose proper TargetVersion override val analyzerServices: PlatformDependentAnalyzerServices get() = JvmPlatformAnalyzerServices @@ -132,7 +132,7 @@ sealed class ScriptDependenciesSourceInfo(val project: Project) : IdeaModuleInfo override fun equals(other: Any?): Boolean = other is ScriptDependenciesSourceInfo && this.project == other.project override val platform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform // TODO(dsavvinov): choose proper TargetVersion + get() = JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): choose proper TargetVersion override val analyzerServices: PlatformDependentAnalyzerServices get() = JvmPlatformAnalyzerServices diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt index 7213311012e..9fec7d220fe 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt @@ -332,5 +332,5 @@ class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSupport } internal fun PsiElement.getModuleInfoPreferringJvmPlatform(): IdeaModuleInfo { - return getPlatformModuleInfo(JvmPlatforms.defaultJvmPlatform) ?: getModuleInfo() + return getPlatformModuleInfo(JvmPlatforms.unspecifiedJvmPlatform) ?: getModuleInfo() } \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt index 034167e5823..2610df6053d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt @@ -126,7 +126,7 @@ internal class ProjectResolutionFacade( packagePartProviderFactory = { IDEPackagePartProvider(it.moduleContentScope) }, moduleByJavaClass = { javaClass: JavaClass -> val psiClass = (javaClass as JavaClassImpl).psi - psiClass.getPlatformModuleInfo(JvmPlatforms.defaultJvmPlatform)?.platformModule ?: psiClass.getNullableModuleInfo() + psiClass.getPlatformModuleInfo(JvmPlatforms.unspecifiedJvmPlatform)?.platformModule ?: psiClass.getNullableModuleInfo() } ) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt index 0f2520a823d..15dbd24f8d6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt @@ -154,7 +154,7 @@ fun PsiElement.hasJavaResolutionFacade(): Boolean = this.originalElement.contain fun PsiElement.javaResolutionFacade() = KotlinCacheService.getInstance(project).getResolutionFacadeByFile( this.originalElement.containingFile ?: reportCouldNotCreateJavaFacade(), - JvmPlatforms.defaultJvmPlatform + JvmPlatforms.unspecifiedJvmPlatform ) private fun PsiElement.reportCouldNotCreateJavaFacade(): Nothing = diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java index d5ee25b0e01..b7c0d24874d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java @@ -58,7 +58,7 @@ public class TargetPlatformDetector { if (context != null) { PsiFile contextFile = context.getContainingFile(); // TODO(dsavvinov): Get default platform with proper target - return contextFile instanceof KtFile ? getPlatform((KtFile) contextFile) : JvmPlatforms.INSTANCE.getDefaultJvmPlatform(); + return contextFile instanceof KtFile ? getPlatform((KtFile) contextFile) : JvmPlatforms.INSTANCE.getUnspecifiedJvmPlatform(); } if (file.isScript()) { diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt index 05e72050d71..e4a65490366 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.platform.jvm.JvmPlatforms abstract class AbstractCompiledKotlinInJavaCompletionTest : KotlinFixtureCompletionBaseTestCase() { - override fun getPlatform() = JvmPlatforms.defaultJvmPlatform + override fun getPlatform() = JvmPlatforms.unspecifiedJvmPlatform override fun getProjectDescriptor() = SdkAndMockLibraryProjectDescriptor(COMPLETION_TEST_DATA_BASE_PATH + "/injava/mockLib", false) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompletionIncrementalResolveTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompletionIncrementalResolveTest.kt index 8a7e9a79132..7b48fbe73de 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompletionIncrementalResolveTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompletionIncrementalResolveTest.kt @@ -82,7 +82,7 @@ abstract class AbstractCompletionIncrementalResolveTest : KotlinLightCodeInsight } testCompletion(FileUtil.loadFile(file, true), - JvmPlatforms.defaultJvmPlatform, + JvmPlatforms.unspecifiedJvmPlatform, { completionType, count -> myFixture.complete(completionType, count) }, additionalValidDirectives = listOf(TYPE_DIRECTIVE_PREFIX, BACKSPACES_DIRECTIVE_PREFIX)) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java index 0c9ee9e4bac..279e8fcf6fa 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java @@ -22,7 +22,7 @@ public abstract class AbstractJvmBasicCompletionTest extends KotlinFixtureComple @NotNull @Override public TargetPlatform getPlatform() { - return JvmPlatforms.INSTANCE.getDefaultJvmPlatform(); + return JvmPlatforms.INSTANCE.getUnspecifiedJvmPlatform(); } @NotNull diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java index 10fb0e9a5b1..1bd72004211 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java @@ -22,7 +22,7 @@ public abstract class AbstractJvmSmartCompletionTest extends KotlinFixtureComple @NotNull @Override public TargetPlatform getPlatform() { - return JvmPlatforms.INSTANCE.getDefaultJvmPlatform(); + return JvmPlatforms.INSTANCE.getUnspecifiedJvmPlatform(); } @NotNull diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt index 062b27bd3c8..05829ba5f57 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt @@ -21,6 +21,6 @@ abstract class AbstractJvmWithLibBasicCompletionTest : KotlinFixtureCompletionBa return SdkAndMockLibraryProjectDescriptor(TEST_PATH + "/" + getTestName(false) + "Src", false) } - override fun getPlatform() = JvmPlatforms.defaultJvmPlatform + override fun getPlatform() = JvmPlatforms.unspecifiedJvmPlatform override fun defaultCompletionType() = CompletionType.BASIC } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt index 07b57baddae..25356704a7b 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.idea.test.KotlinProjectDescriptorWithFacet import org.jetbrains.kotlin.platform.jvm.JvmPlatforms abstract class AbstractKeywordCompletionTest : KotlinFixtureCompletionBaseTestCase() { - override fun getPlatform() = JvmPlatforms.defaultJvmPlatform + override fun getPlatform() = JvmPlatforms.unspecifiedJvmPlatform override fun defaultCompletionType() = CompletionType.BASIC diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt index f9131c3e5ae..0da5e248c7d 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import java.io.File abstract class AbstractKotlinSourceInJavaCompletionTest : KotlinFixtureCompletionBaseTestCase() { - override fun getPlatform() = JvmPlatforms.defaultJvmPlatform + override fun getPlatform() = JvmPlatforms.unspecifiedJvmPlatform override fun doTest(testPath: String) { val mockPath = RELATIVE_COMPLETION_TEST_DATA_BASE_PATH + "/injava/mockLib" diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinStdLibInJavaCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinStdLibInJavaCompletionTest.kt index ed836a6ae5d..f3de0a93be2 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinStdLibInJavaCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinStdLibInJavaCompletionTest.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip import org.jetbrains.kotlin.platform.jvm.JvmPlatforms abstract class AbstractKotlinStdLibInJavaCompletionTest : KotlinFixtureCompletionBaseTestCase() { - override fun getPlatform() = JvmPlatforms.defaultJvmPlatform + override fun getPlatform() = JvmPlatforms.unspecifiedJvmPlatform override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE override fun defaultCompletionType() = CompletionType.BASIC } \ No newline at end of file diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileJvmBasicCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileJvmBasicCompletionTest.kt index 32cbac30079..54a114df721 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileJvmBasicCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileJvmBasicCompletionTest.kt @@ -14,7 +14,7 @@ abstract class AbstractMultiFileJvmBasicCompletionTest : KotlinCompletionTestCas configureByFile(getTestName(false) + ".kt", "") val shouldFail = testPath.contains("NoSpecifiedType") AstAccessControl.testWithControlledAccessToAst(shouldFail, getFile().getVirtualFile(), getProject(), getTestRootDisposable(), { - testCompletion(file.text, JvmPlatforms.defaultJvmPlatform, { completionType, invocationCount -> + testCompletion(file.text, JvmPlatforms.unspecifiedJvmPlatform, { completionType, invocationCount -> setType(completionType) complete(invocationCount) myItems diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileSmartCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileSmartCompletionTest.kt index b55f7478cce..2ed7744c2be 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileSmartCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractMultiFileSmartCompletionTest.kt @@ -18,7 +18,7 @@ abstract class AbstractMultiFileSmartCompletionTest : KotlinCompletionTestCase() protected fun doTest(testPath: String) { configureByFile(getTestName(false) + ".kt", "") AstAccessControl.testWithControlledAccessToAst(false, getFile().getVirtualFile(), getProject(), getTestRootDisposable(), { - testCompletion(file.text, JvmPlatforms.defaultJvmPlatform, { completionType, invocationCount -> + testCompletion(file.text, JvmPlatforms.unspecifiedJvmPlatform, { completionType, invocationCount -> setType(completionType) complete(invocationCount) myItems diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt index 7ad3c4a3235..9112c56614e 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt @@ -89,7 +89,7 @@ object ExpectedCompletionUtils { } } - private val UNSUPPORTED_PLATFORM_MESSAGE = "Only ${JvmPlatforms.defaultJvmPlatform} and ${JsPlatforms.defaultJsPlatform} platforms are supported" + private val UNSUPPORTED_PLATFORM_MESSAGE = "Only ${JvmPlatforms.unspecifiedJvmPlatform} and ${JsPlatforms.defaultJsPlatform} platforms are supported" private val EXIST_LINE_PREFIX = "EXIST:" diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt index 6017ca89828..2c57182c003 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt @@ -30,7 +30,7 @@ class KotlinGradleModuleConfigurator : KotlinWithGradleConfigurator() { get() = NAME override val targetPlatform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform + get() = JvmPlatforms.unspecifiedJvmPlatform @Suppress("DEPRECATION_ERROR") override fun getTargetPlatform() = JvmPlatforms.CompatJvmPlatform diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt index 5e893f8ca08..20f8bb1c349 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt @@ -48,9 +48,6 @@ import org.jetbrains.kotlin.idea.project.languageVersionSettings import org.jetbrains.kotlin.idea.util.projectStructure.allModules import org.jetbrains.kotlin.idea.util.projectStructure.sdk import org.jetbrains.kotlin.platform.TargetPlatform -import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind -import org.jetbrains.kotlin.platform.impl.isCommon -import org.jetbrains.kotlin.platform.impl.isJavaScript import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.platform.js.isJs @@ -947,8 +944,8 @@ class GradleFacetImportTest : GradleImportingTestCase() { configureByFiles() importProject() - checkStableModuleName("project_main", "project", JvmPlatforms.defaultJvmPlatform, isProduction = true) - checkStableModuleName("project_test", "project", JvmPlatforms.defaultJvmPlatform, isProduction = false) + checkStableModuleName("project_main", "project", JvmPlatforms.unspecifiedJvmPlatform, isProduction = true) + checkStableModuleName("project_test", "project", JvmPlatforms.unspecifiedJvmPlatform, isProduction = false) assertAllModulesConfigured() } diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt index d996cb294f8..92fe6a38596 100644 --- a/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt +++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt @@ -42,7 +42,7 @@ object JvmIdePlatformKind : IdePlatformKind() { return K2JVMCompilerArguments() } - override val platforms: List = JvmTarget.values().map { ver -> JvmPlatforms.jvmPlatformByTargetVersion(ver) } + listOf(JvmPlatforms.defaultJvmPlatform) + override val platforms: List = JvmTarget.values().map { ver -> JvmPlatforms.jvmPlatformByTargetVersion(ver) } + listOf(JvmPlatforms.unspecifiedJvmPlatform) override val defaultPlatform get() = JvmPlatforms.defaultJvmPlatform override val argumentsClass get() = K2JVMCompilerArguments::class.java diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt index 3e1c70f3673..4714a67f92e 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt @@ -71,7 +71,7 @@ open class KotlinJavaModuleConfigurator protected constructor() : KotlinWithLibr get() = NAME override val targetPlatform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform + get() = JvmPlatforms.unspecifiedJvmPlatform @Suppress("DEPRECATION_ERROR") override fun getTargetPlatform() = JvmPlatforms.CompatJvmPlatform diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt index fcc767a491f..88fbdbde35e 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt @@ -179,7 +179,7 @@ private object DebugLabelModuleDescriptor } override val platform: TargetPlatform? - get() = JvmPlatforms.defaultJvmPlatform + get() = JvmPlatforms.unspecifiedJvmPlatform override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection { return emptyList() diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt index dae924c018c..112b954a950 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt @@ -41,7 +41,7 @@ class KotlinTemplatesFactory : ProjectTemplatesFactory() { val result = mutableListOf( BuilderBasedTemplate( KotlinModuleBuilder( - JvmPlatforms.defaultJvmPlatform, + JvmPlatforms.unspecifiedJvmPlatform, "JVM | IDEA", "Kotlin project with a JVM target based on the IntelliJ IDEA build system", KotlinIcons.SMALL_LOGO diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt index bb3e87c5e8b..0d6404e1f67 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt @@ -286,7 +286,7 @@ class KotlinBytecodeToolWindow(private val myProject: Project, private val toolW if (!platform.isCommon() && !platform.isJvm()) return null val resolutionFacade = KotlinCacheService.getInstance(ktFile.project) - .getResolutionFacadeByFile(ktFile, JvmPlatforms.defaultJvmPlatform) + .getResolutionFacadeByFile(ktFile, JvmPlatforms.unspecifiedJvmPlatform) ?: return null val bindingContextForFile = resolutionFacade.analyzeWithAllCompilerChecks(listOf(ktFile)).bindingContext diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt index 607f03e04b0..67f3b5d1683 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt @@ -68,7 +68,7 @@ class KotlinJavaMavenConfigurator : KotlinMavenConfigurator( } override val targetPlatform: TargetPlatform - get() = JvmPlatforms.defaultJvmPlatform + get() = JvmPlatforms.unspecifiedJvmPlatform @Suppress("DEPRECATION_ERROR") override fun getTargetPlatform() = JvmPlatforms.CompatJvmPlatform diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt index 6afb86bb54d..1d560d8b127 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt @@ -2529,7 +2529,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() { } with(facetSettings("my-jvm-module")) { - Assert.assertEquals(JvmPlatforms.defaultJvmPlatform, platform) + Assert.assertEquals(JvmPlatforms.jvm16, platform) Assert.assertEquals(listOf("my-common-module1", "my-common-module2"), implementedModuleNames) } @@ -2974,8 +2974,8 @@ class KotlinMavenImporterTest : MavenImportingTestCase() { assertImporterStatePresent() - checkStableModuleName("project", "project", JvmPlatforms.defaultJvmPlatform, isProduction = true) - checkStableModuleName("project", "project", JvmPlatforms.defaultJvmPlatform, isProduction = false) + checkStableModuleName("project", "project", JvmPlatforms.unspecifiedJvmPlatform, isProduction = true) + checkStableModuleName("project", "project", JvmPlatforms.unspecifiedJvmPlatform, isProduction = false) } fun testStableModuleNameWhileUsngMaven_JS() { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt index f6c8373ca2a..52e11d4e4ec 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt @@ -365,7 +365,7 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { if (!modifierBuilder.isValid) return emptyList() val resolutionFacade = KotlinCacheService.getInstance(targetContainer.project) - .getResolutionFacadeByFile(targetContainer.containingFile, JvmPlatforms.defaultJvmPlatform) ?: return emptyList() + .getResolutionFacadeByFile(targetContainer.containingFile, JvmPlatforms.unspecifiedJvmPlatform) ?: return emptyList() val returnTypeInfo = request.returnType.toKotlinTypeInfo(resolutionFacade) val parameters = request.parameters as List>> val parameterInfos = parameters.map { (suggestedNames, expectedTypes) -> diff --git a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt index d35ed03290c..92862f37f3c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt @@ -58,7 +58,7 @@ class KotlinNonJvmSourceRootConverterProvider : ConverterProvider("kotlin-non-jv // TODO(dsavvinov): review how it behaves in HMPP environment private val PLATFORM_TO_STDLIB_DETECTORS: Map) -> Boolean> = mapOf( - JvmPlatforms.defaultJvmPlatform to { roots: Array -> JavaRuntimeDetectionUtil.getRuntimeJar(roots.toList()) != null }, + JvmPlatforms.unspecifiedJvmPlatform to { roots: Array -> JavaRuntimeDetectionUtil.getRuntimeJar(roots.toList()) != null }, JsPlatforms.defaultJsPlatform to { roots: Array -> JsLibraryStdDetectionUtil.getJsStdLibJar(roots.toList()) != null }, CommonPlatforms.defaultCommonPlatform to { roots: Array -> getLibraryJar(roots, PathUtil.KOTLIN_STDLIB_COMMON_JAR_PATTERN) != null } ) @@ -167,7 +167,7 @@ class KotlinNonJvmSourceRootConverterProvider : ConverterProvider("kotlin-non-jv private fun ModuleSettings.detectPlatform(): TargetPlatform { return detectPlatformByFacet() ?: detectPlatformByDependencies() - ?: JvmPlatforms.defaultJvmPlatform + ?: JvmPlatforms.unspecifiedJvmPlatform } private fun ModuleSettings.getSourceFolderElements(): List { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt index 3630001333a..ef8f434fda1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt @@ -78,7 +78,7 @@ abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTest val targetPlatformName = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// PLATFORM: ") if (targetPlatformName != null) { val targetPlatform = when (targetPlatformName) { - "JVM" -> JvmPlatforms.defaultJvmPlatform + "JVM" -> JvmPlatforms.unspecifiedJvmPlatform "JavaScript" -> JsPlatforms.defaultJsPlatform "Common" -> CommonPlatforms.defaultCommonPlatform else -> error("Unexpected platform name: $targetPlatformName") diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index 24a8670e0ad..5d3ecc3c4ad 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -61,7 +61,7 @@ class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() { setupFixtureByCodeFragment(fragmentText) val directives = completionDirectives.map { "//$it" }.joinToString(separator = "\n") testCompletion(directives, - JvmPlatforms.defaultJvmPlatform, { completionType, count -> myFixture.complete(completionType, count) }) + JvmPlatforms.unspecifiedJvmPlatform, { completionType, count -> myFixture.complete(completionType, count) }) } private fun setupFixtureByCodeFragment(fragmentText: String) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt b/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt index d58a66f5a79..348368fa939 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt @@ -13,7 +13,6 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil import com.intellij.openapi.vfs.LocalFileSystem import junit.framework.TestCase import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime -import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.idea.framework.CommonLibraryKind import org.jetbrains.kotlin.idea.framework.JSLibraryKind import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest diff --git a/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt index 1a856616265..fbcfb3179f0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt @@ -37,7 +37,7 @@ abstract class AbstractIdeReplCompletionTest : KotlinFixtureCompletionBaseTestCa super.tearDown() } - override fun getPlatform() = JvmPlatforms.defaultJvmPlatform + override fun getPlatform() = JvmPlatforms.unspecifiedJvmPlatform override fun defaultCompletionType() = CompletionType.BASIC override fun doTest(testPath: String) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationCompletionTest.kt index 0a92d48a9a6..4da135bfe9b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationCompletionTest.kt @@ -13,7 +13,7 @@ abstract class AbstractScriptConfigurationCompletionTest : AbstractScriptConfigu configureScriptFile(path) testCompletion( file.text, - JvmPlatforms.defaultJvmPlatform, + JvmPlatforms.unspecifiedJvmPlatform, additionalValidDirectives = switches, complete = { completionType, count -> setType(completionType)