Index: clangd/ClangdLSPServer.h =================================================================== --- clangd/ClangdLSPServer.h +++ clangd/ClangdLSPServer.h @@ -74,6 +74,12 @@ std::vector getFixes(StringRef File, const clangd::Diagnostic &D); + /// Gets current document contents for \p File. Returns None if \p File is not + /// currently tracked. + /// FIXME(ibiryukov): This function is here to allow offset-to-Position + /// conversions in outside code, maybe there's a way to get rid of it. + llvm::Optional getDocument(PathRef File); + JSONOutput &Out; /// Used to indicate that the 'shutdown' request was received from the /// Language Server client. @@ -100,6 +106,9 @@ // the worker thread that may otherwise run an async callback on partially // destructed instance of ClangdLSPServer. ClangdServer Server; + + // Store of the current versions of the open documents. + DraftStore DraftMgr; }; } // namespace clangd Index: clangd/ClangdLSPServer.cpp =================================================================== --- clangd/ClangdLSPServer.cpp +++ clangd/ClangdLSPServer.cpp @@ -12,6 +12,7 @@ #include "JSONRPCDispatcher.h" #include "SourceCode.h" #include "URI.h" +#include "llvm/Support/Errc.h" #include "llvm/Support/FormatVariadic.h" #include "llvm/Support/Path.h" @@ -142,8 +143,12 @@ if (Params.metadata && !Params.metadata->extraFlags.empty()) CDB.setExtraFlagsForFile(Params.textDocument.uri.file(), std::move(Params.metadata->extraFlags)); - Server.addDocument(Params.textDocument.uri.file(), Params.textDocument.text, - WantDiagnostics::Yes); + + PathRef File = Params.textDocument.uri.file(); + std::string &Contents = Params.textDocument.text; + + DraftMgr.updateDraft(File, Contents); + Server.addDocument(File, std::move(Contents), WantDiagnostics::Yes); } void ClangdLSPServer::onDocumentDidChange(DidChangeTextDocumentParams &Params) { @@ -154,9 +159,13 @@ if (Params.wantDiagnostics.hasValue()) WantDiags = Params.wantDiagnostics.getValue() ? WantDiagnostics::Yes : WantDiagnostics::No; + + PathRef File = Params.textDocument.uri.file(); + std::string &Contents = Params.contentChanges[0].text; + // We only support full syncing right now. - Server.addDocument(Params.textDocument.uri.file(), - Params.contentChanges[0].text, WantDiags); + DraftMgr.updateDraft(File, Contents); + Server.addDocument(File, std::move(Contents), WantDiags); } void ClangdLSPServer::onFileEvent(DidChangeWatchedFilesParams &Params) { @@ -188,7 +197,7 @@ } else if (Params.command == ExecuteCommandParams::CLANGD_INSERT_HEADER_INCLUDE) { auto &FileURI = Params.includeInsertion->textDocument.uri; - auto Code = Server.getDocument(FileURI.file()); + auto Code = getDocument(FileURI.file()); if (!Code) return replyError(ErrorCode::InvalidParams, ("command " + @@ -233,7 +242,7 @@ void ClangdLSPServer::onRename(RenameParams &Params) { Path File = Params.textDocument.uri.file(); - llvm::Optional Code = Server.getDocument(File); + llvm::Optional Code = getDocument(File); if (!Code) return replyError(ErrorCode::InvalidParams, "onRename called for non-added file"); @@ -254,13 +263,15 @@ } void ClangdLSPServer::onDocumentDidClose(DidCloseTextDocumentParams &Params) { - Server.removeDocument(Params.textDocument.uri.file()); + PathRef File = Params.textDocument.uri.file(); + DraftMgr.removeDraft(File); + Server.removeDocument(File); } void ClangdLSPServer::onDocumentOnTypeFormatting( DocumentOnTypeFormattingParams &Params) { auto File = Params.textDocument.uri.file(); - auto Code = Server.getDocument(File); + auto Code = getDocument(File); if (!Code) return replyError(ErrorCode::InvalidParams, "onDocumentOnTypeFormatting called for non-added file"); @@ -276,7 +287,7 @@ void ClangdLSPServer::onDocumentRangeFormatting( DocumentRangeFormattingParams &Params) { auto File = Params.textDocument.uri.file(); - auto Code = Server.getDocument(File); + auto Code = getDocument(File); if (!Code) return replyError(ErrorCode::InvalidParams, "onDocumentRangeFormatting called for non-added file"); @@ -291,7 +302,7 @@ void ClangdLSPServer::onDocumentFormatting(DocumentFormattingParams &Params) { auto File = Params.textDocument.uri.file(); - auto Code = Server.getDocument(File); + auto Code = getDocument(File); if (!Code) return replyError(ErrorCode::InvalidParams, "onDocumentFormatting called for non-added file"); @@ -307,7 +318,7 @@ void ClangdLSPServer::onCodeAction(CodeActionParams &Params) { // We provide a code action for each diagnostic at the requested location // which has FixIts available. - auto Code = Server.getDocument(Params.textDocument.uri.file()); + auto Code = getDocument(Params.textDocument.uri.file()); if (!Code) return replyError(ErrorCode::InvalidParams, "onCodeAction called for non-added file"); @@ -329,7 +340,13 @@ } void ClangdLSPServer::onCompletion(TextDocumentPositionParams &Params) { - Server.codeComplete(Params.textDocument.uri.file(), Params.position, CCOpts, + PathRef File = Params.textDocument.uri.file(); + + llvm::Optional Contents = DraftMgr.getDraft(File); + // FIXME(sammccall): return error for consistency? + assert(Contents && "codeComplete called for non-added document"); + + Server.codeComplete(File, std::move(*Contents), Params.position, CCOpts, [](llvm::Expected List) { if (!List) return replyError(ErrorCode::InvalidParams, @@ -339,14 +356,22 @@ } void ClangdLSPServer::onSignatureHelp(TextDocumentPositionParams &Params) { - Server.signatureHelp(Params.textDocument.uri.file(), Params.position, - [](llvm::Expected SignatureHelp) { - if (!SignatureHelp) - return replyError( - ErrorCode::InvalidParams, - llvm::toString(SignatureHelp.takeError())); - reply(*SignatureHelp); - }); + PathRef File = Params.textDocument.uri.file(); + + auto Callback = [](llvm::Expected SignatureHelp) { + if (!SignatureHelp) + return replyError(ErrorCode::InvalidParams, + llvm::toString(SignatureHelp.takeError())); + reply(*SignatureHelp); + }; + + llvm::Optional Contents = DraftMgr.getDraft(File); + if (!Contents) + return Callback(llvm::make_error( + "signatureHelp is called for non-added document", + llvm::errc::invalid_argument)); + + Server.signatureHelp(File, std::move(*Contents), Params.position, Callback); } void ClangdLSPServer::onGoToDefinition(TextDocumentPositionParams &Params) { @@ -479,3 +504,11 @@ }}, }); } + +llvm::Optional ClangdLSPServer::getDocument(PathRef File) { + llvm::Optional Contents = DraftMgr.getDraft(File); + if (!Contents) + return llvm::None; + + return std::move(*Contents); +} Index: clangd/ClangdServer.h =================================================================== --- clangd/ClangdServer.h +++ clangd/ClangdServer.h @@ -117,7 +117,7 @@ /// \p File is already tracked. Also schedules parsing of the AST for it on a /// separate thread. When the parsing is complete, DiagConsumer passed in /// constructor will receive onDiagnosticsReady callback. - void addDocument(PathRef File, StringRef Contents, + void addDocument(PathRef File, std::string Contents, WantDiagnostics WD = WantDiagnostics::Auto); /// Remove \p File from list of tracked files, schedule a request to free @@ -138,24 +138,22 @@ /// Run code completion for \p File at \p Pos. /// Request is processed asynchronously. /// - /// The current draft for \p File will be used. If \p UsedFS is non-null, it - /// will be overwritten by vfs::FileSystem used for completion. + /// \p Contents is the current content of the file. 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. However, it /// is safe to call removeDocument for \p File after this method returns, even /// while returned future is not yet ready. /// A version of `codeComplete` that runs \p Callback on the processing thread /// when codeComplete results become available. - void codeComplete(PathRef File, Position Pos, + void codeComplete(PathRef File, std::string Contents, Position Pos, const clangd::CodeCompleteOptions &Opts, Callback CB); - /// Provide signature help for \p File at \p Pos. If \p OverridenContents is - /// not None, they will used only for signature help, i.e. no diagnostics - /// update will be scheduled and a draft for \p File will not be updated. If - /// If \p UsedFS is non-null, it will be overwritten by vfs::FileSystem used - /// for signature help. This method should only be called for tracked files. - void signatureHelp(PathRef File, Position Pos, Callback CB); + /// Provide signature help for \p File at \p Pos. \p Contents is the current + /// content of the file. This method should only be called for tracked files. + void signatureHelp(PathRef File, std::string Contents, Position Pos, + Callback CB); /// Get definition of symbol at a specified \p Line and \p Column in \p File. void findDefinitions(PathRef File, Position Pos, @@ -206,12 +204,6 @@ StringRef DeclaringHeader, StringRef InsertedHeader); - /// Gets current document contents for \p File. Returns None if \p File is not - /// currently tracked. - /// FIXME(ibiryukov): This function is here to allow offset-to-Position - /// conversions in outside code, maybe there's a way to get rid of it. - llvm::Optional getDocument(PathRef File); - /// Only for testing purposes. /// Waits until all requests to worker thread are finished and dumps AST for /// \p File. \p File must be in the list of added documents. @@ -240,13 +232,25 @@ formatCode(llvm::StringRef Code, PathRef File, ArrayRef Ranges); + typedef uint64_t DocVersion; + + /// Document contents with a version of this content. + struct VersionedContents { + DocVersion Version; + std::string Contents; + }; + void consumeDiagnostics(PathRef File, DocVersion Version, std::vector Diags); CompileArgsCache CompileArgs; DiagnosticsConsumer &DiagConsumer; FileSystemProvider &FSProvider; - DraftStore DraftMgr; + + // For each file, an internal number representing the latest version we know + // about it. + llvm::StringMap InternalVersion; + // The index used to look up symbols. This could be: // - null (all index functionality is optional) // - the dynamic index owned by ClangdServer (FileIdx) Index: clangd/ClangdServer.cpp =================================================================== --- clangd/ClangdServer.cpp +++ clangd/ClangdServer.cpp @@ -115,11 +115,11 @@ this->RootPath = NewRootPath; } -void ClangdServer::addDocument(PathRef File, StringRef Contents, +void ClangdServer::addDocument(PathRef File, std::string Contents, WantDiagnostics WantDiags) { - DocVersion Version = DraftMgr.updateDraft(File, Contents); + DocVersion Version = ++InternalVersion[File]; ParseInputs Inputs = {CompileArgs.getCompileCommand(File), - FSProvider.getFileSystem(), Contents.str()}; + FSProvider.getFileSystem(), std::move(Contents)}; Path FileStr = File.str(); WorkScheduler.update(File, std::move(Inputs), WantDiags, @@ -129,18 +129,18 @@ } void ClangdServer::removeDocument(PathRef File) { - DraftMgr.removeDraft(File); + ++InternalVersion[File]; CompileArgs.invalidate(File); WorkScheduler.remove(File); } void ClangdServer::forceReparse(PathRef File) { // forceReparse promises to request new compilation flags from CDB, so we - // remove any cahced flags. + // remove any cached flags. CompileArgs.invalidate(File); tooling::CompileCommand NewCommand = CompileArgs.getCompileCommand(File); - DocVersion Version = DraftMgr.getVersion(File); + DocVersion Version = InternalVersion[File]; Path FileStr = File.str(); WorkScheduler.updateCompileCommand( File, std::move(NewCommand), FSProvider.getFileSystem(), @@ -149,7 +149,8 @@ }); } -void ClangdServer::codeComplete(PathRef File, Position Pos, +void ClangdServer::codeComplete(PathRef File, std::string Contents, + Position Pos, const clangd::CodeCompleteOptions &Opts, Callback CB) { // Copy completion options for passing them to async task handler. @@ -157,17 +158,11 @@ if (!CodeCompleteOpts.Index) // Respect overridden index. CodeCompleteOpts.Index = Index; - VersionedDraft Latest = DraftMgr.getDraft(File); - if (!Latest.Draft) - return CB(llvm::make_error( - "codeComplete called for non-added document", - llvm::errc::invalid_argument)); - // Copy PCHs to avoid accessing this->PCHs concurrently std::shared_ptr PCHs = this->PCHs; auto FS = FSProvider.getFileSystem(); auto Task = [PCHs, Pos, FS, CodeCompleteOpts]( - std::string Contents, Path File, Callback CB, + Path File, std::string Contents, Callback CB, llvm::Expected IP) { assert(IP && "error when trying to read preamble for codeComplete"); auto PreambleData = IP->Preamble; @@ -183,20 +178,15 @@ WorkScheduler.runWithPreamble( "CodeComplete", File, - Bind(Task, std::move(*Latest.Draft), File.str(), std::move(CB))); + Bind(Task, File.str(), std::move(Contents), std::move(CB))); } -void ClangdServer::signatureHelp(PathRef File, Position Pos, - Callback CB) { - VersionedDraft Latest = DraftMgr.getDraft(File); - if (!Latest.Draft) - return CB(llvm::make_error( - "signatureHelp is called for non-added document", - llvm::errc::invalid_argument)); +void ClangdServer::signatureHelp(PathRef File, std::string Contents, + Position Pos, Callback CB) { auto PCHs = this->PCHs; auto FS = FSProvider.getFileSystem(); - auto Action = [Pos, FS, PCHs](std::string Contents, Path File, + auto Action = [Pos, FS, PCHs](Path File, std::string Contents, Callback CB, llvm::Expected IP) { if (!IP) @@ -211,7 +201,7 @@ WorkScheduler.runWithPreamble( "SignatureHelp", File, - Bind(Action, std::move(*Latest.Draft), File.str(), std::move(CB))); + Bind(Action, File.str(), std::move(Contents), std::move(CB))); } llvm::Expected @@ -350,13 +340,6 @@ return formatReplacements(Code, *Replaces, *Style); } -llvm::Optional ClangdServer::getDocument(PathRef File) { - auto Latest = DraftMgr.getDraft(File); - if (!Latest.Draft) - return llvm::None; - return std::move(*Latest.Draft); -} - void ClangdServer::dumpAST(PathRef File, UniqueFunction Callback) { auto Action = [](decltype(Callback) Callback, @@ -472,11 +455,6 @@ void ClangdServer::findDocumentHighlights( PathRef File, Position Pos, Callback> CB) { - auto FileContents = DraftMgr.getDraft(File); - if (!FileContents.Draft) - return CB(llvm::make_error( - "findDocumentHighlights called on non-added file", - llvm::errc::invalid_argument)); auto FS = FSProvider.getFileSystem(); auto Action = [FS, Pos](Callback> CB, @@ -490,12 +468,6 @@ } void ClangdServer::findHover(PathRef File, Position Pos, Callback CB) { - Hover FinalHover; - auto FileContents = DraftMgr.getDraft(File); - if (!FileContents.Draft) - return CB(llvm::make_error( - "findHover called on non-added file", llvm::errc::invalid_argument)); - auto FS = FSProvider.getFileSystem(); auto Action = [Pos, FS](Callback CB, llvm::Expected InpAST) { Index: clangd/DraftStore.h =================================================================== --- clangd/DraftStore.h +++ clangd/DraftStore.h @@ -13,24 +13,12 @@ #include "Path.h" #include "clang/Basic/LLVM.h" #include "llvm/ADT/StringMap.h" -#include #include #include -#include namespace clang { namespace clangd { -/// Using unsigned int type here to avoid undefined behaviour on overflow. -typedef uint64_t DocVersion; - -/// Document draft with a version of this draft. -struct VersionedDraft { - DocVersion Version; - /// If the value of the field is None, draft is now deleted - llvm::Optional Draft; -}; - /// A thread-safe container for files opened in a workspace, addressed by /// filenames. The contents are owned by the DraftStore. Versions are mantained /// for the all added documents, including removed ones. The document version is @@ -39,27 +27,17 @@ public: /// \return version and contents of the stored document. /// For untracked files, a (0, None) pair is returned. - VersionedDraft getDraft(PathRef File) const; - - /// \return List of names of active drafts in this store. Drafts that were - /// removed (which still have an entry in the Drafts map) are not returned by - /// this function. - std::vector getActiveFiles() const; - - /// \return version of the tracked document. - /// For untracked files, 0 is returned. - DocVersion getVersion(PathRef File) const; - + llvm::Optional getDraft(PathRef File) const; /// Replace contents of the draft for \p File with \p Contents. /// \return The new version of the draft for \p File. - DocVersion updateDraft(PathRef File, StringRef Contents); + void updateDraft(PathRef File, StringRef Contents); /// Remove the contents of the draft /// \return The new version of the draft for \p File. - DocVersion removeDraft(PathRef File); + void removeDraft(PathRef File); private: mutable std::mutex Mutex; - llvm::StringMap Drafts; + llvm::StringMap> Drafts; }; } // namespace clangd Index: clangd/DraftStore.cpp =================================================================== --- clangd/DraftStore.cpp +++ clangd/DraftStore.cpp @@ -12,49 +12,24 @@ using namespace clang; using namespace clang::clangd; -VersionedDraft DraftStore::getDraft(PathRef File) const { +llvm::Optional DraftStore::getDraft(PathRef File) const { std::lock_guard Lock(Mutex); auto It = Drafts.find(File); if (It == Drafts.end()) - return {0, llvm::None}; - return It->second; -} - -std::vector DraftStore::getActiveFiles() const { - std::lock_guard Lock(Mutex); - std::vector ResultVector; - - for (auto DraftIt = Drafts.begin(); DraftIt != Drafts.end(); DraftIt++) - if (DraftIt->second.Draft) - ResultVector.push_back(DraftIt->getKey()); - - return ResultVector; -} - -DocVersion DraftStore::getVersion(PathRef File) const { - std::lock_guard Lock(Mutex); + return llvm::None; - auto It = Drafts.find(File); - if (It == Drafts.end()) - return 0; - return It->second.Version; + return It->second; } -DocVersion DraftStore::updateDraft(PathRef File, StringRef Contents) { +void DraftStore::updateDraft(PathRef File, StringRef Contents) { std::lock_guard Lock(Mutex); - auto &Entry = Drafts[File]; - DocVersion NewVersion = ++Entry.Version; - Entry.Draft = Contents; - return NewVersion; + Drafts[File] = Contents; } -DocVersion DraftStore::removeDraft(PathRef File) { +void DraftStore::removeDraft(PathRef File) { std::lock_guard Lock(Mutex); - auto &Entry = Drafts[File]; - DocVersion NewVersion = ++Entry.Version; - Entry.Draft = llvm::None; - return NewVersion; + Drafts[File] = llvm::None; } Index: unittests/clangd/ClangdTests.cpp =================================================================== --- unittests/clangd/ClangdTests.cpp +++ unittests/clangd/ClangdTests.cpp @@ -530,13 +530,14 @@ ClangdServer Server(CDB, FS, DiagConsumer, ClangdServer::optsForTest()); auto FooCpp = testPath("foo.cpp"); + StringRef SourceContents = "int main() {}"; // clang cannot create CompilerInvocation if we pass two files in the // CompileCommand. We pass the file in ExtraFlags once and CDB adds another // one in getCompileCommand(). CDB.ExtraClangFlags.push_back(FooCpp); // Clang can't parse command args in that case, but we shouldn't crash. - runAddDocument(Server, FooCpp, "int main() {}"); + runAddDocument(Server, FooCpp, SourceContents); EXPECT_EQ(runDumpAST(Server, FooCpp), ""); EXPECT_ERROR(runFindDefinitions(Server, FooCpp, Position())); @@ -544,11 +545,13 @@ EXPECT_ERROR(runRename(Server, FooCpp, Position(), "new_name")); // FIXME: codeComplete and signatureHelp should also return errors when they // can't parse the file. - EXPECT_THAT(cantFail(runCodeComplete(Server, FooCpp, Position(), - clangd::CodeCompleteOptions())) - .items, - IsEmpty()); - auto SigHelp = runSignatureHelp(Server, FooCpp, Position()); + EXPECT_THAT( + cantFail(runCodeComplete(Server, FooCpp, SourceContents.str(), Position(), + clangd::CodeCompleteOptions())) + .items, + IsEmpty()); + auto SigHelp = + runSignatureHelp(Server, FooCpp, SourceContents.str(), Position()); ASSERT_TRUE(bool(SigHelp)) << "signatureHelp returned an error"; EXPECT_THAT(SigHelp->signatures, IsEmpty()); } @@ -564,19 +567,23 @@ // BlockingRequestInterval-request will be a blocking one. const unsigned BlockingRequestInterval = 40; - const auto SourceContentsWithoutErrors = R"cpp( -int a; -int b; -int c; -int d; -)cpp"; + auto GetSourceContents = [](bool WithErrors) { + const auto SourceContentsWithoutErrors = R"cpp( + int a; + int b; + int c; + int d; + )cpp"; - const auto SourceContentsWithErrors = R"cpp( -int a = x; -int b; -int c; -int d; -)cpp"; + const auto SourceContentsWithErrors = R"cpp( + int a = x; + int b; + int c; + int d; + )cpp"; + + return WithErrors ? SourceContentsWithErrors : SourceContentsWithoutErrors; + }; // Giving invalid line and column number should not crash ClangdServer, but // just to make sure we're sometimes hitting the bounds inside the file we @@ -687,8 +694,7 @@ auto AddDocument = [&](unsigned FileIndex) { bool ShouldHaveErrors = ShouldHaveErrorsDist(RandGen); Server.addDocument(FilePaths[FileIndex], - ShouldHaveErrors ? SourceContentsWithErrors - : SourceContentsWithoutErrors); + GetSourceContents(ShouldHaveErrors)); UpdateStatsOnAddDocument(FileIndex, ShouldHaveErrors); }; @@ -720,8 +726,10 @@ auto CodeCompletionRequest = [&]() { unsigned FileIndex = FileIndexDist(RandGen); + const RequestStats &Stats = ReqStats[FileIndex]; + // Make sure we don't violate the ClangdServer's contract. - if (ReqStats[FileIndex].FileIsRemoved) + if (Stats.FileIsRemoved) AddDocument(FileIndex); Position Pos; @@ -733,8 +741,9 @@ // requests as opposed to AddDocument/RemoveDocument, which are implicitly // cancelled by any subsequent AddDocument/RemoveDocument request to the // same file. - cantFail(runCodeComplete(Server, FilePaths[FileIndex], Pos, - clangd::CodeCompleteOptions())); + cantFail(runCodeComplete(Server, FilePaths[FileIndex], + GetSourceContents(Stats.LastContentsHadErrors), + Pos, clangd::CodeCompleteOptions())); }; auto FindDefinitionsRequest = [&]() { Index: unittests/clangd/CodeCompleteTests.cpp =================================================================== --- unittests/clangd/CodeCompleteTests.cpp +++ unittests/clangd/CodeCompleteTests.cpp @@ -122,7 +122,7 @@ Annotations Test(Text); runAddDocument(Server, File, Test.code()); auto CompletionList = - cantFail(runCodeComplete(Server, File, Test.point(), Opts)); + cantFail(runCodeComplete(Server, File, Test.code(), Test.point(), Opts)); // Sanity-check that filterText is valid. EXPECT_THAT(CompletionList.items, Each(NameContainsFilter())); return CompletionList; @@ -537,16 +537,17 @@ auto I = memIndex({var("ns::index")}); Opts.Index = I.get(); - auto WithIndex = cantFail(runCodeComplete(Server, File, Test.point(), Opts)); + auto WithIndex = + cantFail(runCodeComplete(Server, File, Test.code(), Test.point(), Opts)); EXPECT_THAT(WithIndex.items, UnorderedElementsAre(Named("local"), Named("index"))); - auto ClassFromPreamble = - cantFail(runCodeComplete(Server, File, Test.point("2"), Opts)); + auto ClassFromPreamble = cantFail( + runCodeComplete(Server, File, Test.code(), Test.point("2"), Opts)); EXPECT_THAT(ClassFromPreamble.items, Contains(Named("member"))); Opts.Index = nullptr; auto WithoutIndex = - cantFail(runCodeComplete(Server, File, Test.point(), Opts)); + cantFail(runCodeComplete(Server, File, Test.code(), Test.point(), Opts)); EXPECT_THAT(WithoutIndex.items, UnorderedElementsAre(Named("local"), Named("preamble"))); } @@ -577,7 +578,8 @@ )cpp"); runAddDocument(Server, File, Test.code()); - auto Results = cantFail(runCodeComplete(Server, File, Test.point(), {})); + auto Results = + cantFail(runCodeComplete(Server, File, Test.code(), Test.point(), {})); // "XYZ" and "foo" are not included in the file being completed but are still // visible through the index. EXPECT_THAT(Results.items, Has("XYZ", CompletionItemKind::Class)); @@ -616,7 +618,7 @@ auto File = testPath("foo.cpp"); Annotations Test(Text); runAddDocument(Server, File, Test.code()); - return cantFail(runSignatureHelp(Server, File, Test.point())); + return cantFail(runSignatureHelp(Server, File, Test.code(), Test.point())); } MATCHER_P(ParamsAre, P, "") { Index: unittests/clangd/SyncAPI.h =================================================================== --- unittests/clangd/SyncAPI.h +++ unittests/clangd/SyncAPI.h @@ -22,11 +22,13 @@ void runAddDocument(ClangdServer &Server, PathRef File, StringRef Contents); llvm::Expected -runCodeComplete(ClangdServer &Server, PathRef File, Position Pos, - clangd::CodeCompleteOptions Opts); +runCodeComplete(ClangdServer &Server, PathRef File, std::string Contents, + Position Pos, clangd::CodeCompleteOptions Opts); llvm::Expected runSignatureHelp(ClangdServer &Server, - PathRef File, Position Pos); + PathRef File, + std::string Contents, + Position Pos); llvm::Expected> runFindDefinitions(ClangdServer &Server, PathRef File, Position Pos); Index: unittests/clangd/SyncAPI.cpp =================================================================== --- unittests/clangd/SyncAPI.cpp +++ unittests/clangd/SyncAPI.cpp @@ -68,17 +68,19 @@ } // namespace llvm::Expected -runCodeComplete(ClangdServer &Server, PathRef File, Position Pos, - clangd::CodeCompleteOptions Opts) { +runCodeComplete(ClangdServer &Server, PathRef File, std::string Contents, + Position Pos, clangd::CodeCompleteOptions Opts) { llvm::Optional> Result; - Server.codeComplete(File, Pos, Opts, capture(Result)); + Server.codeComplete(File, std::move(Contents), Pos, Opts, capture(Result)); return std::move(*Result); } llvm::Expected runSignatureHelp(ClangdServer &Server, - PathRef File, Position Pos) { + PathRef File, + std::string Contents, + Position Pos) { llvm::Optional> Result; - Server.signatureHelp(File, Pos, capture(Result)); + Server.signatureHelp(File, std::move(Contents), Pos, capture(Result)); return std::move(*Result); }