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

[CodeCompletion] Make sure callback is always called from performOperation

Browse Source 
We had some situations left that neither returned an error, nor called the callback with results in `performOperation`. Return an error in these and adjust the tests to correctly match the error.
This commit is contained in:
Alex Hoppen
2021-10-07 19:04:56 +02:00
parent 2fcb24e716
commit b6e03e3d98
8 changed files with 89 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
View File

@@ -190,8 +190,15 @@ static void swiftCodeCompleteImpl(
ide::makeCodeCompletionCallbacksFactory(CompletionContext,
Consumer));
auto *SF = CI.getCodeCompletionFile();
performCodeCompletionSecondPass(*SF, *callbacksFactory);
if (!Result->DidFindCodeCompletionToken) {
Callback(ResultType::success(
{/*HasResults=*/false, &CI.getASTContext(), &CI.getInvocation(),
&CompletionContext, /*RequestedModules=*/{}, /*DC=*/nullptr}));
return;
}
performCodeCompletionSecondPass(*CI.getCodeCompletionFile(),
*callbacksFactory);
if (!Consumer.HandleResultWasCalled) {
// If we didn't receive a handleResult call from the second pass,
// we didn't receive any results. To make sure Callback gets called