diff options
| -rw-r--r-- | clang-tools-extra/clangd/ClangdServer.cpp | 8 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/ClangdServer.h | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/clang-tools-extra/clangd/ClangdServer.cpp b/clang-tools-extra/clangd/ClangdServer.cpp index 9851962fed4..bdf28405c1f 100644 --- a/clang-tools-extra/clangd/ClangdServer.cpp +++ b/clang-tools-extra/clangd/ClangdServer.cpp @@ -192,7 +192,8 @@ void ClangdServer::forceReparse(PathRef File) { Tagged<std::vector<CompletionItem>> ClangdServer::codeComplete(PathRef File, Position Pos, - llvm::Optional<StringRef> OverridenContents) { + llvm::Optional<StringRef> OverridenContents, + IntrusiveRefCntPtr<vfs::FileSystem> *UsedFS) { std::string DraftStorage; if (!OverridenContents) { auto FileContents = DraftMgr.getDraft(File); @@ -203,8 +204,11 @@ ClangdServer::codeComplete(PathRef File, Position Pos, OverridenContents = DraftStorage; } - std::vector<CompletionItem> Result; auto TaggedFS = FSProvider.getTaggedFileSystem(File); + if (UsedFS) + *UsedFS = TaggedFS.Value; + + std::vector<CompletionItem> Result; Units.runOnUnitWithoutReparse(File, *OverridenContents, ResourceDir, CDB, PCHs, TaggedFS.Value, [&](ClangdUnit &Unit) { Result = Unit.codeComplete( diff --git a/clang-tools-extra/clangd/ClangdServer.h b/clang-tools-extra/clangd/ClangdServer.h index 8a2936f02df..e96fa452706 100644 --- a/clang-tools-extra/clangd/ClangdServer.h +++ b/clang-tools-extra/clangd/ClangdServer.h @@ -175,10 +175,14 @@ public: /// will be scheduled and a draft for \p File will not be updated. /// If \p OverridenContents is None, contents of the current draft for \p File /// will be used. - /// This method should only be called for currently tracked files. + /// If \p UsedFS is non-null, it will be overwritten by vfs::FileSystem used + /// for completion. + /// This method should only be called for currently tracked + /// files. Tagged<std::vector<CompletionItem>> codeComplete(PathRef File, Position Pos, - llvm::Optional<StringRef> OverridenContents = llvm::None); + llvm::Optional<StringRef> OverridenContents = llvm::None, + IntrusiveRefCntPtr<vfs::FileSystem> *UsedFS = nullptr); /// Get definition of symbol at a specified \p Line and \p Column in \p File. Tagged<std::vector<Location>> findDefinitions(PathRef File, Position Pos); |
