From 6ca6bb2d45be982b5208ed00cb10db04eaf11713 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Thu, 8 Apr 2021 17:45:48 +0300 Subject: [PATCH] Load configuration for FirLoadCompiledKotlin --- .../jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt | 2 ++ .../prop/NonConstValWithConstantValueAttribute.txt | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt index e7f24b683d1..9e624b33396 100644 --- a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt +++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt @@ -9,6 +9,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJavaTest import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetModule import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.ConfigurationKind @@ -54,6 +55,7 @@ abstract class AbstractFirLoadCompiledKotlin : AbstractFirLoadBinariesTest() { val file = File(path) val configuration = newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, emptyList(), emptyList()) + AbstractLoadJavaTest.updateConfigurationWithDirectives(file.readText(), configuration) val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) return compileKotlinToDirAndGetModule(listOf(file), tmpdir, environment) diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt index 343b2e3dd9d..6d466e3b1a3 100644 --- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt +++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt @@ -1,16 +1,16 @@ -public final val nonConstVal1: R|kotlin/Int| +public final val nonConstVal1: R|kotlin/Int| = Int(1) public get(): R|kotlin/Int| public final class C : R|kotlin/Any| { public final companion object Companion : R|kotlin/Any| { - public final val nonConstVal3: R|kotlin/Int| + public final val nonConstVal3: R|kotlin/Int| = Int(3) public get(): R|kotlin/Int| private constructor(): R|test/C.Companion| } - public final val nonConstVal2: R|kotlin/Int| + public final val nonConstVal2: R|kotlin/Int| = Int(2) public get(): R|kotlin/Int| public constructor(): R|test/C|