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

sourcekitd source.request.index_to_store fixes - new test and minor changes

Browse Source
This commit is contained in:
David Goldman
2023-06-30 15:55:43 -04:00
parent d618233166
commit af81adb63c
5 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp
View File

@@ -401,13 +401,13 @@ static void emitIndexDataForSourceFile(SourceFile &PrimarySourceFile,
}
void SwiftLangSupport::indexToStore(
StringRef InputFile, ArrayRef<const char *> Args,
StringRef PrimaryFilePath, ArrayRef<const char *> Args,
IndexStoreOptions Opts,
SourceKitCancellationToken CancellationToken,
IndexToStoreReceiver Receiver) {
std::string Error;
SwiftInvocationRef Invok =
ASTMgr->getTypecheckInvocation(Args, InputFile, Error);
ASTMgr->getTypecheckInvocation(Args, PrimaryFilePath, Error);
if (!Invok) {
LOG_WARN_FUNC("failed to create an ASTInvocation: " << Error);
Receiver(RequestResult<IndexStoreInfo>::fromError(Error));
@@ -439,10 +439,8 @@ void SwiftLangSupport::indexToStore(
};
auto ASTConsumer = std::make_shared<IndexStoreASTConsumer>(std::move(Receiver), std::move(Opts));
/// FIXME: When request cancellation is implemented and Xcode adopts it,
/// don't use 'OncePerASTToken'.
static const char OncePerASTToken = 0;
getASTManager()->processASTAsync(Invok, ASTConsumer, &OncePerASTToken,
getASTManager()->processASTAsync(Invok, ASTConsumer,
/*OncePerASTToken=*/nullptr,
CancellationToken,
llvm::vfs::getRealFileSystem());
}