averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59526 from AnthonyLatsis/closure_result_mismatch_diagQoI

Browse Source 
Sema, DiagQoI: Fix and tailor diagnosis of explicit closure result type conflicts
This commit is contained in:
Anthony Latsis
2022-06-21 00:19:52 +03:00
committed by GitHub
parent 87027070b0 a07f2b4889
commit d76e74391f
5 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Sema/CSDiagnostics.cpp
View File

@@ -2335,17 +2335,32 @@ bool ContextualFailure::diagnoseAsError() {
auto toType = getToType();
Diag<Type, Type> diagnostic;
switch (path.back().getKind()) {
const auto lastPathEltKind = path.back().getKind();
switch (lastPathEltKind) {
case ConstraintLocator::ClosureBody:
case ConstraintLocator::ClosureResult: {
auto *closure = castToExpr<ClosureExpr>(getRawAnchor());
if (closure->hasExplicitResultType() &&
closure->getExplicitResultTypeRepr()) {
auto resultRepr = closure->getExplicitResultTypeRepr();
emitDiagnosticAt(resultRepr->getStartLoc(),
diag::incorrect_explicit_closure_result, fromType,
toType)
.fixItReplace(resultRepr->getSourceRange(), toType.getString());
if (lastPathEltKind == ConstraintLocator::ClosureBody) {
// The conflict is between the return type and the declared result type.
emitDiagnosticAt(resultRepr->getStartLoc(),
diag::incorrect_explicit_closure_result_vs_return_type,
toType, fromType)
.fixItReplace(resultRepr->getSourceRange(), fromType.getString());
} else {
// The conflict is between the declared result type and the
// contextual type.
emitDiagnosticAt(
resultRepr->getStartLoc(),
diag::incorrect_explicit_closure_result_vs_contextual_type,
fromType, toType)
.fixItReplace(resultRepr->getSourceRange(), toType.getString());
}
return true;
}