Depend on passed language version explicitly to compute nullability annotation settings
This commit is contained in:
+1
-1
@@ -83,7 +83,7 @@ class LanguageVersionSettingsBuilder {
|
||||
analysisFlags.forEach { withFlag(it.first, it.second) }
|
||||
|
||||
environmentConfigurators.forEach {
|
||||
it.provideAdditionalAnalysisFlags(directives).entries.forEach { (flag, value) ->
|
||||
it.provideAdditionalAnalysisFlags(directives, languageVersion).entries.forEach { (flag, value) ->
|
||||
withFlag(flag, value)
|
||||
}
|
||||
}
|
||||
|
||||
+5
-1
@@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project
|
||||
import org.jetbrains.kotlin.config.AnalysisFlag
|
||||
import org.jetbrains.kotlin.config.CompilerConfiguration
|
||||
import org.jetbrains.kotlin.config.CompilerConfigurationKey
|
||||
import org.jetbrains.kotlin.config.LanguageVersion
|
||||
import org.jetbrains.kotlin.test.directives.model.*
|
||||
import org.jetbrains.kotlin.test.model.TestModule
|
||||
|
||||
@@ -36,7 +37,10 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices)
|
||||
|
||||
open fun DirectiveToConfigurationKeyExtractor.provideConfigurationKeys() {}
|
||||
|
||||
open fun provideAdditionalAnalysisFlags(directives: RegisteredDirectives): Map<AnalysisFlag<*>, Any?> {
|
||||
open fun provideAdditionalAnalysisFlags(
|
||||
directives: RegisteredDirectives,
|
||||
languageVersion: LanguageVersion
|
||||
): Map<AnalysisFlag<*>, Any?> {
|
||||
return emptyMap()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user