jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-21 15:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Test] Add ability to provide additional analysis flags in EnvironmentConfigurator

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-22 12:20:39 +03:00
committed by TeamCityServer
parent c4691de72d
commit e287742842
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/builders/LanguageVersionSettingsBuilder.kt
View File

@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue
import org.jetbrains.kotlin.test.services.DefaultsDsl
import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
import org.jetbrains.kotlin.test.util.LANGUAGE_FEATURE_PATTERN
import org.jetbrains.kotlin.utils.addToStdlib.runIf
@@ -48,7 +49,7 @@ class LanguageVersionSettingsBuilder {
analysisFlags[flag] = value
}
fun configureUsingDirectives(directives: RegisteredDirectives) {
fun configureUsingDirectives(directives: RegisteredDirectives, environmentConfigurators: List<EnvironmentConfigurator>) {
val apiVersion = directives.singleOrZeroValue(LanguageSettingsDirectives.API_VERSION)
if (apiVersion != null) {
this.apiVersion = apiVersion
@@ -74,6 +75,12 @@ class LanguageVersionSettingsBuilder {
analysisFlags.forEach { withFlag(it.first, it.second) }
environmentConfigurators.forEach {
it.provideAdditionalAnalysisFlags(directives).entries.forEach { (flag, value) ->
withFlag(flag, value)
}
}
directives[LanguageSettingsDirectives.LANGUAGE].forEach { parseLanguageFeature(it) }
}

6
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
View File

@@ -6,8 +6,8 @@
package org.jetbrains.kotlin.test.services
import com.intellij.mock.MockProject
import org.jetbrains.kotlin.config.AnalysisFlag
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.test.directives.model.ComposedRegisteredDirectives
import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
import org.jetbrains.kotlin.test.model.TestModule
@@ -23,4 +23,8 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices)
get() = testServices.moduleStructure
open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {}
open fun provideAdditionalAnalysisFlags(directives: RegisteredDirectives): Map<AnalysisFlag<*>, Any?> {
return emptyMap()
}
}

21
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt
View File

@@ -49,11 +49,20 @@ class TestConfigurationImpl(
}
}
private val environmentConfigurators: List<EnvironmentConfigurator> =
environmentConfigurators.map { it.invoke(testServices) }.also { configurators ->
configurators.flatMapTo(allDirectives) { it.directivesContainers }
for (configurator in configurators) {
configurator.additionalServices.forEach { testServices.register(it) }
}
}
override val moduleStructureExtractor: ModuleStructureExtractor = ModuleStructureExtractorImpl(
testServices,
additionalSourceProviders.map { it.invoke(testServices) }.also {
it.flatMapTo(allDirectives) { provider -> provider.directives }
}
},
this.environmentConfigurators
)
override val metaTestConfigurators: List<MetaTestConfigurator> = metaTestConfigurators.map {
@@ -75,15 +84,7 @@ class TestConfigurationImpl(
val sourceFileProvider = SourceFileProviderImpl(sourceFilePreprocessors)
register(SourceFileProvider::class, sourceFileProvider)
val configurators = environmentConfigurators.map { it.invoke(this) }
configurators.flatMapTo(allDirectives) { it.directivesContainers }
for (configurator in configurators) {
configurator.additionalServices.forEach { register(it) }
}
val environmentProvider = CompilerConfigurationProviderImpl(
rootDisposable,
configurators
)
val environmentProvider = CompilerConfigurationProviderImpl(rootDisposable, this@TestConfigurationImpl.environmentConfigurators)
register(CompilerConfigurationProvider::class, environmentProvider)
register(AssertionsService::class, assertions)

5
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
View File

@@ -24,7 +24,8 @@ import java.io.File
class ModuleStructureExtractorImpl(
testServices: TestServices,
additionalSourceProviders: List<AdditionalSourceProvider>
additionalSourceProviders: List<AdditionalSourceProvider>,
private val environmentConfigurators: List<EnvironmentConfigurator>
) : ModuleStructureExtractor(testServices, additionalSourceProviders) {
companion object {
private val allowedExtensionsForFiles = listOf(".kt", ".kts", ".java")
@@ -210,7 +211,7 @@ class ModuleStructureExtractorImpl(
private fun finishModule() {
finishFile()
val moduleDirectives = directivesBuilder.build() + testServices.defaultDirectives + globalDirectives
currentModuleLanguageVersionSettingsBuilder.configureUsingDirectives(moduleDirectives)
currentModuleLanguageVersionSettingsBuilder.configureUsingDirectives(moduleDirectives, environmentConfigurators)
val moduleName = currentModuleName ?: defaultModuleName
val testModule = TestModule(
name = moduleName,