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

[FIR] Set source on return expression in generated getters

Browse Source 
#KT-55835
This commit is contained in:
Kirill Rakhman
2023-06-26 14:42:17 +03:00
committed by Space Team
parent ef086a4c88
commit 311975f1ed
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirFunctionReturnTypeMismatchChecker.kt
+3 -1
View File
@@ -24,7 +24,9 @@ import org.jetbrains.kotlin.fir.types.*
object FirFunctionReturnTypeMismatchChecker : FirReturnExpressionChecker() { object FirFunctionReturnTypeMismatchChecker : FirReturnExpressionChecker() {
override fun check(expression: FirReturnExpression, context: CheckerContext, reporter: DiagnosticReporter) { override fun check(expression: FirReturnExpression, context: CheckerContext, reporter: DiagnosticReporter) {
if (expression.source == null) return // checked in FirDelegatedPropertyChecker
if (expression.source?.kind == KtFakeSourceElementKind.DelegatedPropertyAccessor) return
val targetElement = expression.target.labeledElement val targetElement = expression.target.labeledElement
if (targetElement is FirErrorFunction || targetElement is FirAnonymousFunction && targetElement.isLambda) { if (targetElement is FirErrorFunction || targetElement is FirAnonymousFunction && targetElement.isLambda) {
return return
compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
+1
View File
@@ -448,6 +448,7 @@ fun <T> FirPropertyBuilder.generateAccessorsByDelegate(
origin = FirFunctionCallOrigin.Operator origin = FirFunctionCallOrigin.Operator
} }
target = returnTarget target = returnTarget
source = fakeSource
} }
) )
if (annotations != null) { if (annotations != null) {