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

Inject languageVersionSettings into VarianceChecker

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-03-03 12:42:52 +03:00
committed by Space
parent ebed224f82
commit eb42a01926
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
+1 -1
View File
@@ -218,7 +218,7 @@ class LazyTopDownAnalyzer(
overrideResolver.check(c) overrideResolver.check(c)
varianceChecker.check(c, languageVersionSettings) varianceChecker.check(c)
declarationResolver.resolveAnnotationsOnFiles(c, fileScopeProvider) declarationResolver.resolveAnnotationsOnFiles(c, fileScopeProvider)
compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
+5 -7
View File
@@ -42,11 +42,10 @@ import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure
class ManualVariance(val descriptor: TypeParameterDescriptor, val variance: Variance) class ManualVariance(val descriptor: TypeParameterDescriptor, val variance: Variance)
class VarianceChecker(trace: BindingTrace) { class VarianceChecker(trace: BindingTrace, languageVersionSettings: LanguageVersionSettings) {
private val core = VarianceCheckerCore(trace.bindingContext, trace) private val core = VarianceCheckerCore(trace.bindingContext, trace, languageVersionSettings = languageVersionSettings)
fun check(c: TopDownAnalysisContext, languageVersionSettings: LanguageVersionSettings) { fun check(c: TopDownAnalysisContext) {
core.languageVersionSettings = languageVersionSettings
core.check(c) core.check(c)
} }
} }
@@ -60,10 +59,9 @@ class VarianceConflictDiagnosticData(
class VarianceCheckerCore( class VarianceCheckerCore(
val context: BindingContext, val context: BindingContext,
private val diagnosticSink: DiagnosticSink, private val diagnosticSink: DiagnosticSink,
private val manualVariance: ManualVariance? = null private val manualVariance: ManualVariance? = null,
private val languageVersionSettings: LanguageVersionSettings? = null
) { ) {
internal var languageVersionSettings: LanguageVersionSettings? = null
fun check(c: TopDownAnalysisContext) { fun check(c: TopDownAnalysisContext) {
checkClasses(c) checkClasses(c)
checkMembers(c) checkMembers(c)