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

[FIR] Don't set source of inferred type from expected type

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2022-08-26 12:14:51 +03:00
committed by teamcity
parent e1fd184d14
commit 40b13898bd
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirClassVarianceChecker.kt
+4 -2
View File
@@ -64,10 +64,12 @@ object FirClassVarianceChecker : FirClassChecker() {
if (member is FirProperty && member.isVar) Variance.INVARIANT else Variance.OUT_VARIANCE if (member is FirProperty && member.isVar) Variance.INVARIANT else Variance.OUT_VARIANCE
var returnSource = member.returnTypeRef.source var returnSource = member.returnTypeRef.source
if (returnSource != null && memberSource != null) { if (returnSource != null) {
if (returnSource.kind is KtFakeSourceElementKind && memberSource.kind !is KtFakeSourceElementKind) { if (memberSource != null && returnSource.kind is KtFakeSourceElementKind && memberSource.kind !is KtFakeSourceElementKind) {
returnSource = memberSource returnSource = memberSource
} }
} else {
returnSource = memberSource
} }
checkVarianceConflict(member.returnTypeRef, returnTypeVariance, context, reporter, returnSource) checkVarianceConflict(member.returnTypeRef, returnTypeVariance, context, reporter, returnSource)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
-3
View File
@@ -1068,9 +1068,6 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
buildResolvedTypeRef { buildResolvedTypeRef {
type = this@toExpectedTypeRef.coneType type = this@toExpectedTypeRef.coneType
annotations.addAll(this@toExpectedTypeRef.annotations) annotations.addAll(this@toExpectedTypeRef.annotations)
this@toExpectedTypeRef.source?.fakeElement(KtFakeSourceElementKind.PropertyFromParameter)?.let {
source = it
}
} }
} }
} }