From 0620762b976b0837401f4f214f88afdca823ac83 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Thu, 15 Aug 2019 10:12:39 +0300 Subject: [PATCH] Enable new inference explicitly for MPP tests with type refinement --- .../jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt | 3 ++- .../jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt b/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt index 2bfbcdabab2..55aff9d745c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/multiplatform/multiPlatformSetup.kt @@ -94,7 +94,8 @@ fun AbstractMultiModuleTest.doSetup(projectModel: ProjectResolveModel) { platform, implementedModuleNames = resolveModule.dependencies.filter { it.kind == ResolveDependency.Kind.DEPENDS_ON }.map { it.to.name } ) - ideaModule.enableMultiPlatform() + // New inference is enabled here as these tests are using type refinement feature that is working only along with NI + ideaModule.enableMultiPlatform(additionalCompilerArguments = "-Xnew-inference") } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt index 28e0c481445..e90ddd7271e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt @@ -109,12 +109,12 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() { }, this, kind) } - fun Module.enableMultiPlatform() { + fun Module.enableMultiPlatform(additionalCompilerArguments: String = "") { createFacet() val facetSettings = KotlinFacetSettingsProvider.getInstance(project).getInitializedSettings(this) facetSettings.useProjectSettings = false facetSettings.compilerSettings = CompilerSettings().apply { - additionalArguments += " -Xmulti-platform -XXtype-refinement" + additionalArguments += " -Xmulti-platform $additionalCompilerArguments" } }