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

[IDE] Report ambiguous cursor info results

Browse Source
This commit is contained in:
Alex Hoppen
2023-03-17 10:49:29 -07:00
parent 05b59d1462
commit eb6729754d
5 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Sema/CSSolver.cpp
View File

@@ -1430,7 +1430,10 @@ ConstraintSystem::solve(SyntacticElementTarget &target,
case SolutionResult::Ambiguous:
// If salvaging produced an ambiguous result, it has already been
// diagnosed.
if (stage == 1) {
// If we have found an ambiguous solution in the first stage, salvaging
// won't produce more solutions, so we can inform the solution callback
// about the current ambiguous solutions straight away.
if (stage == 1 || Context.SolutionCallback) {
reportSolutionsToSolutionCallback(solution);
solution.markAsDiagnosed();
return None;
@@ -1449,8 +1452,10 @@ ConstraintSystem::solve(SyntacticElementTarget &target,
LLVM_FALLTHROUGH;
case SolutionResult::UndiagnosedError:
if (shouldSuppressDiagnostics()) {
reportSolutionsToSolutionCallback(solution);
/// If we have a SolutionCallback, we are inspecting constraint system
/// solutions directly and thus also want to receive ambiguous solutions.
/// Hence always run the second (salvaging) stage.
if (shouldSuppressDiagnostics() && !Context.SolutionCallback) {
solution.markAsDiagnosed();
return None;
}