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 #66208 from LucianoPAlmeida/diag-ternary

Browse Source 
[Sema] Increase impact of ternary then branch aiming better diagnostics
This commit is contained in:
Luciano Almeida
2023-05-31 01:24:43 -03:00
committed by GitHub
parent 5db2b28420 fef908efac
commit 1d90de16c7
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Sema/CSSimplify.cpp
View File

@@ -14778,8 +14778,15 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
// means that result would attempt a type from each side if
// one is available and that would result in two fixes - one for
// each mismatched branch.
if (branchElt->forElse())
if (branchElt->forElse()) {
impact = 10;
} else {
// Also increase impact for `then` branch lower than `else` to still
// eliminate ambiguity, but slightly worst than the average fix to avoid
// so the solution which record this fix wouldn't be picked over one
// that has contextual mismatch fix on the result of ternary expression.
impact = 5;
}
}
using SingleValueStmtBranch = LocatorPathElt::SingleValueStmtBranch;
if (auto branchElt = locator->getLastElementAs<SingleValueStmtBranch>()) {