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

[SourceKit] When AST-based cursor info is cancelled, don’t run solver-based cursor info

Browse Source 
Running solver-based cursor info in the callback that is informed about cancellation extends the window for a deadlock.
This commit is contained in:
Alex Hoppen
2023-06-22 21:29:08 +02:00
parent 8caf9997c9
commit b66dfadea5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
View File

@@ -2041,8 +2041,14 @@ void SwiftLangSupport::getCursorInfo(
fileSystem, Receiver, Offset, Actionables, fileSystem, Receiver, Offset, Actionables,
SymbolGraph]( SymbolGraph](
const RequestResult<CursorInfoData> &Res) { const RequestResult<CursorInfoData> &Res) {
if (Res.isCancelled()) {
// If the AST-based result got cancelled, we don’t want to start
// solver-based cursor info anymore.
Receiver(Res);
return;
}
// AST based completion *always* produces a result // AST based completion *always* produces a result
bool NoResults = Res.isError() || Res.isCancelled(); bool NoResults = Res.isError();
if (Res.isValue()) { if (Res.isValue()) {
NoResults = Res.value().Symbols.empty(); NoResults = Res.value().Symbols.empty();
} }