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

Add extension CompilerConfiguration.languageVersionSettings for convenience

Browse Source
This commit is contained in:
Alexander Udalov
2017-02-10 20:35:09 +03:00
parent 103bd6dbde
commit 21449763ab
21 changed files with 83 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
+4 -2
View File
@@ -24,8 +24,8 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult
import org.jetbrains.kotlin.analyzer.common.DefaultAnalyzerFacade
import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport
import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider
import org.jetbrains.kotlin.config.CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS
import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.config.languageVersionSettings
import org.jetbrains.kotlin.container.get
import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.context.SimpleGlobalContext
@@ -261,7 +261,9 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
val configuration =
if (languageVersionSettings != null)
environment.configuration.copy().apply { put(LANGUAGE_VERSION_SETTINGS, languageVersionSettings) }
environment.configuration.copy().apply {
this.languageVersionSettings = languageVersionSettings
}
else
environment.configuration
compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+4 -2
View File
@@ -164,8 +164,10 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
}
if (explicitLanguageVersion != null) {
configuration.put(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS,
new LanguageVersionSettingsImpl(explicitLanguageVersion, ApiVersion.createByLanguageVersion(explicitLanguageVersion)));
CommonConfigurationKeysKt.setLanguageVersionSettings(
configuration,
new LanguageVersionSettingsImpl(explicitLanguageVersion, ApiVersion.createByLanguageVersion(explicitLanguageVersion))
);
}
updateConfigurationWithFlags(configuration, kotlinConfigurationFlags);