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

FIR: Rework reporting COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH

Browse Source 
Previously, it was reported via additional check on successful calls
But now it's contained within FirErrorNamedReference
This commit is contained in:
Denis.Zharkov
2021-04-27 15:44:29 +03:00
committed by teamcityserver
parent c46d049394
commit c758069d7c
1 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDestructuringDeclarationChecker.kt
+32 -44
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeConstraintSystemHasContradiction
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateError
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedNameError
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
@@ -71,21 +72,14 @@ object FirDestructuringDeclarationChecker : FirPropertyChecker() {
} ?: return
when (val reference = componentCall.calleeReference) {
is FirResolvedNamedReference ->
checkComponentCallReturnType(
originalDestructuringDeclarationOrInitializerSource,
declaration,
componentCall,
originalDestructuringDeclaration,
reference,
reporter,
context
)
is FirErrorNamedReference ->
checkComponentCall(
originalDestructuringDeclarationOrInitializerSource,
originalDestructuringDeclarationType,
reference,
declaration,
componentCall,
originalDestructuringDeclaration,
reporter,
context
)
@@ -109,44 +103,13 @@ object FirDestructuringDeclarationChecker : FirPropertyChecker() {
}
}
private fun checkComponentCallReturnType(
source: FirSourceElement,
property: FirProperty,
componentCall: FirComponentCall,
destructuringDeclaration: FirVariable<*>,
reference: FirResolvedNamedReference,
reporter: DiagnosticReporter,
context: CheckerContext
) {
val destructuringType = componentCall.typeRef.coneType
if (destructuringType is ConeKotlinErrorType) {
// There will be other errors on this error type.
return
}
val expectedType = property.returnTypeRef.coneType
if (!AbstractTypeChecker.isSubtypeOf(context.session.typeContext, destructuringType, expectedType)) {
val typeMismatchSource =
// ... = { `(entry, ...)` -> ... } // Report on specific `entry`
if (destructuringDeclaration is FirValueParameter)
property.source
// val (entry, ...) = `destructuring_declaration` // Report on a destructuring declaration
else
source
reporter.reportOn(
typeMismatchSource,
FirErrors.COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH,
(reference.resolvedSymbol.fir as FirSimpleFunction).name,
destructuringType,
expectedType,
context
)
}
}
private fun checkComponentCall(
source: FirSourceElement,
destructuringDeclarationType: ConeKotlinType,
reference: FirErrorNamedReference,
property: FirProperty,
componentCall: FirComponentCall,
destructuringDeclaration: FirVariable<*>,
reporter: DiagnosticReporter,
context: CheckerContext
) {
@@ -179,6 +142,31 @@ object FirDestructuringDeclarationChecker : FirPropertyChecker() {
)
}
}
is ConeConstraintSystemHasContradiction -> {
val componentType = componentCall.typeRef.coneType
if (componentType is ConeKotlinErrorType) {
// There will be other errors on this error type.
return
}
val expectedType = property.returnTypeRef.coneType
if (!AbstractTypeChecker.isSubtypeOf(context.session.typeContext, componentType, expectedType)) {
val typeMismatchSource =
// ... = { `(entry, ...)` -> ... } // Report on specific `entry`
if (destructuringDeclaration is FirValueParameter)
property.source
// val (entry, ...) = `destructuring_declaration` // Report on a destructuring declaration
else
source
reporter.reportOn(
typeMismatchSource,
FirErrors.COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH,
diagnostic.candidate.callInfo.name,
componentType,
expectedType,
context
)
}
}
}
}