mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
[SourceKit/CodeCompletion] Use callback function to run the second pass
To controls the lifetime of CompilerInstance within CompletionIntance. - Prevent from using the same CompilerInstance from multiple completion requests - Separate the stacktrace between "fast" and "normal" completions - Further code consolidation between various completion-like requests
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
|
||||
#include "SwiftLangSupport.h"
|
||||
#include "SwiftASTManager.h"
|
||||
#include "SwiftEditorDiagConsumer.h"
|
||||
#include "SourceKit/Core/Context.h"
|
||||
#include "SourceKit/SwiftLang/Factory.h"
|
||||
#include "SourceKit/Support/FileSystemProvider.h"
|
||||
@@ -23,6 +24,7 @@
|
||||
#include "swift/AST/SILOptions.h"
|
||||
#include "swift/AST/USRGeneration.h"
|
||||
#include "swift/Config.h"
|
||||
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
|
||||
#include "swift/IDE/CodeCompletion.h"
|
||||
#include "swift/IDE/CodeCompletionCache.h"
|
||||
#include "swift/IDE/CompletionInstance.h"
|
||||
@@ -951,6 +953,68 @@ SwiftLangSupport::getFileSystem(const Optional<VFSOptions> &vfsOptions,
|
||||
return llvm::vfs::getRealFileSystem();
|
||||
}
|
||||
|
||||
bool SwiftLangSupport::performCompletionLikeOperation(
|
||||
llvm::MemoryBuffer *UnresolvedInputFile, unsigned Offset,
|
||||
ArrayRef<const char *> Args,
|
||||
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
|
||||
std::string &Error, llvm::function_ref<void(CompilerInstance &)> Callback) {
|
||||
assert(FileSystem);
|
||||
|
||||
// Resolve symlinks for the input file; we resolve them for the input files
|
||||
// in the arguments as well.
|
||||
// FIXME: We need the Swift equivalent of Clang's FileEntry.
|
||||
llvm::SmallString<128> bufferIdentifier;
|
||||
if (auto err = FileSystem->getRealPath(
|
||||
UnresolvedInputFile->getBufferIdentifier(), bufferIdentifier))
|
||||
bufferIdentifier = UnresolvedInputFile->getBufferIdentifier();
|
||||
|
||||
// Create a buffer for code completion. This contains '\0' at 'Offset'
|
||||
// position of 'UnresolvedInputFile' buffer.
|
||||
auto origOffset = Offset;
|
||||
auto newBuffer = ide::makeCodeCompletionMemoryBuffer(
|
||||
UnresolvedInputFile, Offset, bufferIdentifier);
|
||||
|
||||
SourceManager SM;
|
||||
DiagnosticEngine Diags(SM);
|
||||
PrintingDiagnosticConsumer PrintDiags;
|
||||
EditorDiagConsumer TraceDiags;
|
||||
trace::TracedOperation TracedOp{trace::OperationKind::CodeCompletion};
|
||||
|
||||
Diags.addConsumer(PrintDiags);
|
||||
if (TracedOp.enabled()) {
|
||||
Diags.addConsumer(TraceDiags);
|
||||
trace::SwiftInvocation SwiftArgs;
|
||||
trace::initTraceInfo(SwiftArgs, bufferIdentifier, Args);
|
||||
TracedOp.setDiagnosticProvider(
|
||||
[&](SmallVectorImpl<DiagnosticEntryInfo> &diags) {
|
||||
TraceDiags.getAllDiagnostics(diags);
|
||||
});
|
||||
TracedOp.start(
|
||||
SwiftArgs,
|
||||
{std::make_pair("OriginalOffset", std::to_string(origOffset)),
|
||||
std::make_pair("Offset", std::to_string(Offset))});
|
||||
}
|
||||
ForwardingDiagnosticConsumer CIDiags(Diags);
|
||||
|
||||
CompilerInvocation Invocation;
|
||||
bool Failed = getASTManager()->initCompilerInvocation(
|
||||
Invocation, Args, Diags, newBuffer->getBufferIdentifier(), FileSystem,
|
||||
Error);
|
||||
if (Failed)
|
||||
return false;
|
||||
if (!Invocation.getFrontendOptions().InputsAndOutputs.hasInputs()) {
|
||||
Error = "no input filenames specified";
|
||||
return false;
|
||||
}
|
||||
|
||||
// Pin completion instance.
|
||||
auto CompletionInst = getCompletionInstance();
|
||||
|
||||
return CompletionInst->performOperation(Invocation, Args, FileSystem,
|
||||
newBuffer.get(), Offset, Error,
|
||||
&CIDiags, Callback);
|
||||
}
|
||||
|
||||
CloseClangModuleFiles::~CloseClangModuleFiles() {
|
||||
clang::Preprocessor &PP = loader.getClangPreprocessor();
|
||||
clang::ModuleMap &ModMap = PP.getHeaderSearchInfo().getModuleMap();
|
||||
|
||||
Reference in New Issue
Block a user