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

Move VFS to SwiftLangSupport layer

Browse Source
This commit is contained in:
Ben Langmuir
2019-06-21 11:34:22 -07:00
committed by Marc Rasi
parent 027c4d2a62
commit 6884d3a1fd
12 changed files with 190 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@
#include "SwiftASTManager.h"
#include "SwiftLangSupport.h"
#include "SwiftEditorDiagConsumer.h"
#include "SourceKit/Support/FileSystemProvider.h"
#include "SourceKit/Support/Logging.h"
#include "SourceKit/Support/UIdent.h"
@@ -216,8 +217,22 @@ static bool swiftCodeCompleteImpl(
void SwiftLangSupport::codeComplete(
llvm::MemoryBuffer *UnresolvedInputFile, unsigned Offset,
SourceKit::CodeCompletionConsumer &SKConsumer, ArrayRef<const char *> Args,
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem) {
assert(FileSystem);
Optional<VFSOptions> vfsOptions) {
auto fileSystem = llvm::vfs::getRealFileSystem();
if (vfsOptions) {
auto provider = getFileSystemProvider(vfsOptions->name);
if (!provider) {
return SKConsumer.failed("unknown virtual filesystem 'key.vfs.name'");
}
SmallString<0> error;
fileSystem = provider->getFileSystem(vfsOptions->arguments, error);
if (!fileSystem) {
return SKConsumer.failed(error);
}
}
SwiftCodeCompletionConsumer SwiftConsumer([&](
MutableArrayRef<CodeCompletionResult *> Results,
SwiftCompletionInfo &info) {
@@ -255,7 +270,7 @@ void SwiftLangSupport::codeComplete(
std::string Error;
if (!swiftCodeCompleteImpl(*this, UnresolvedInputFile, Offset, SwiftConsumer,
Args, FileSystem, Error)) {
Args, fileSystem, Error)) {
SKConsumer.failed(Error);
}
}