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

[Analysis API] CliTestModuleCompiler: support LANGUAGE_VERSION directive

Browse Source 
^KT-64884
This commit is contained in:
Dmitrii Gridin
2024-02-13 00:31:44 +01:00
committed by Space Team
parent a567793d10
commit 2e2e592cc3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CliTestModuleCompilers.kt
+7 -2
View File
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.platform.isJs
import org.jetbrains.kotlin.platform.jvm.isJvm import org.jetbrains.kotlin.platform.jvm.isJvm
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.compilerConfigurationProvider import org.jetbrains.kotlin.test.services.compilerConfigurationProvider
@@ -70,11 +71,15 @@ abstract class CliTestModuleCompiler : TestModuleCompiler() {
} }
private fun buildCommonCompilerOptions(module: TestModule): List<String> = buildList { private fun buildCommonCompilerOptions(module: TestModule): List<String> = buildList {
module.directives[LanguageSettingsDirectives.API_VERSION].firstOrNull()?.let { apiVersion -> module.directives.singleOrZeroValue(LanguageSettingsDirectives.API_VERSION)?.let { apiVersion ->
addAll(listOf(CommonCompilerArguments::apiVersion.cliArgument, apiVersion.versionString)) addAll(listOf(CommonCompilerArguments::apiVersion.cliArgument, apiVersion.versionString))
} }
module.directives[LanguageSettingsDirectives.LANGUAGE].firstOrNull()?.let { module.directives.singleOrZeroValue(LanguageSettingsDirectives.LANGUAGE_VERSION)?.let { languageVersion ->
addAll(listOf(CommonCompilerArguments::languageVersion.cliArgument, languageVersion.versionString))
}
module.directives.singleOrZeroValue(LanguageSettingsDirectives.LANGUAGE)?.let {
add("-XXLanguage:$it") add("-XXLanguage:$it")
} }