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

[SourceKit] Allow executing a completion-like operation without inserting a code completion token into the buffer

Browse Source 
We will use this for solver-based cursor info, which doesn’t use code completion tokens.
This commit is contained in:
Alex Hoppen
2022-11-29 10:22:47 +01:00
parent 1485fe554f
commit 04ff291ae0
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
View File

@@ -1008,7 +1008,7 @@ SwiftLangSupport::getFileSystem(const Optional<VFSOptions> &vfsOptions,
void SwiftLangSupport::performWithParamsToCompletionLikeOperation(
llvm::MemoryBuffer *UnresolvedInputFile, unsigned Offset,
ArrayRef<const char *> Args,
bool InsertCodeCompletionToken, ArrayRef<const char *> Args,
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
SourceKitCancellationToken CancellationToken,
llvm::function_ref<void(CancellableResult<CompletionLikeOperationParams>)>
@@ -1026,8 +1026,18 @@ void SwiftLangSupport::performWithParamsToCompletionLikeOperation(
// 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);
// If we inserted a code completion token into the buffer, this keeps the
// buffer alive. Should never be accessed, `buffer` should be used instead.
std::unique_ptr<llvm::MemoryBuffer> codeCompletionBuffer;
llvm::MemoryBuffer *buffer;
if (InsertCodeCompletionToken) {
codeCompletionBuffer = ide::makeCodeCompletionMemoryBuffer(
UnresolvedInputFile, Offset, bufferIdentifier);
buffer = codeCompletionBuffer.get();
} else {
buffer = UnresolvedInputFile;
}
SourceManager SM;
DiagnosticEngine Diags(SM);
@@ -1055,7 +1065,7 @@ void SwiftLangSupport::performWithParamsToCompletionLikeOperation(
std::string CompilerInvocationError;
bool CreatingInvocationFailed = getASTManager()->initCompilerInvocation(
Invocation, Args, FrontendOptions::ActionType::Typecheck, Diags,
newBuffer->getBufferIdentifier(), FileSystem, CompilerInvocationError);
buffer->getBufferIdentifier(), FileSystem, CompilerInvocationError);
if (CreatingInvocationFailed) {
PerformOperation(CancellableResult<CompletionLikeOperationParams>::failure(
CompilerInvocationError));
@@ -1075,7 +1085,7 @@ void SwiftLangSupport::performWithParamsToCompletionLikeOperation(
CancellationFlag->store(true, std::memory_order_relaxed);
});
CompletionLikeOperationParams Params = {Invocation, newBuffer.get(), &CIDiags,
CompletionLikeOperationParams Params = {Invocation, buffer, &CIDiags,
CancellationFlag};
PerformOperation(
CancellableResult<CompletionLikeOperationParams>::success(Params));