azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load configuration for FirLoadCompiledKotlin

Browse Source
This commit is contained in:
Denis.Zharkov
2021-04-08 17:45:48 +03:00
committed by TeamCityServer
parent b9d2a1842a
commit 6ca6bb2d45
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt
+2
View File
@@ -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.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.descriptors.ModuleDescriptor 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.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetModule
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.ConfigurationKind
@@ -54,6 +55,7 @@ abstract class AbstractFirLoadCompiledKotlin : AbstractFirLoadBinariesTest() {
val file = File(path) val file = File(path)
val configuration = newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, emptyList(), emptyList<File>()) val configuration = newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, emptyList(), emptyList<File>())
AbstractLoadJavaTest.updateConfigurationWithDirectives(file.readText(), configuration)
val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
return compileKotlinToDirAndGetModule(listOf(file), tmpdir, environment) return compileKotlinToDirAndGetModule(listOf(file), tmpdir, environment)
compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
Vendored
+3 -3
View File
@@ -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 get(): R|kotlin/Int|
public final class C : R|kotlin/Any| { public final class C : R|kotlin/Any| {
public final companion object Companion : 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| public get(): R|kotlin/Int|
private constructor(): R|test/C.Companion| 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 get(): R|kotlin/Int|
public constructor(): R|test/C| public constructor(): R|test/C|