[clangd] Remove codecomplete override content API. Long live addDocument!

llvm-svn: 326211

3 files changed, 10 insertions, 32 deletions

diff --git a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp
index d4c9d7d1e29..ccf2bedc56f 100644
--- a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp
+++ b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp
@@ -337,24 +337,6 @@ TEST(CompletionTest, CompletionOptions) {
   }
 }
 
-// Check code completion works when the file contents are overridden.
-TEST(CompletionTest, CheckContentsOverride) {
-  MockFSProvider FS;
-  IgnoreDiagnostics DiagConsumer;
-  MockCompilationDatabase CDB;
-  ClangdServer Server(CDB, DiagConsumer, FS, getDefaultAsyncThreadsCount(),
-                      /*StorePreamblesInMemory=*/true);
-  auto File = testPath("foo.cpp");
-  Server.addDocument(File, "ignored text!");
-
-  Annotations Example("int cbc; int b = ^;");
-  auto Results =
-      runCodeComplete(Server, File, Example.point(),
-                      clangd::CodeCompleteOptions(), StringRef(Example.code()))
-          .Value;
-  EXPECT_THAT(Results.items, Contains(Named("cbc")));
-}
-
 TEST(CompletionTest, Priorities) {
   auto Internal = completions(R"cpp(
       class Foo {
diff --git a/clang-tools-extra/unittests/clangd/SyncAPI.cpp b/clang-tools-extra/unittests/clangd/SyncAPI.cpp
index 10f40533f03..75cc781900e 100644
--- a/clang-tools-extra/unittests/clangd/SyncAPI.cpp
+++ b/clang-tools-extra/unittests/clangd/SyncAPI.cpp
@@ -61,20 +61,18 @@ template <typename T> CaptureProxy<T> capture(llvm::Optional<T> &Target) {
 }
 } // namespace
 
-Tagged<CompletionList>
-runCodeComplete(ClangdServer &Server, PathRef File, Position Pos,
-                clangd::CodeCompleteOptions Opts,
-                llvm::Optional<StringRef> OverridenContents) {
+Tagged<CompletionList> runCodeComplete(ClangdServer &Server, PathRef File,
+                                       Position Pos,
+                                       clangd::CodeCompleteOptions Opts) {
   llvm::Optional<Tagged<CompletionList>> Result;
-  Server.codeComplete(File, Pos, Opts, capture(Result), OverridenContents);
+  Server.codeComplete(File, Pos, Opts, capture(Result));
   return std::move(*Result);
 }
 
 llvm::Expected<Tagged<SignatureHelp>>
-runSignatureHelp(ClangdServer &Server, PathRef File, Position Pos,
-                 llvm::Optional<StringRef> OverridenContents) {
+runSignatureHelp(ClangdServer &Server, PathRef File, Position Pos) {
   llvm::Optional<llvm::Expected<Tagged<SignatureHelp>>> Result;
-  Server.signatureHelp(File, Pos, capture(Result), OverridenContents);
+  Server.signatureHelp(File, Pos, capture(Result));
   return std::move(*Result);
 }
 
diff --git a/clang-tools-extra/unittests/clangd/SyncAPI.h b/clang-tools-extra/unittests/clangd/SyncAPI.h
index 6b8f27d3af9..31d8483e339 100644
--- a/clang-tools-extra/unittests/clangd/SyncAPI.h
+++ b/clang-tools-extra/unittests/clangd/SyncAPI.h
@@ -18,14 +18,12 @@
 namespace clang {
 namespace clangd {
 
-Tagged<CompletionList>
-runCodeComplete(ClangdServer &Server, PathRef File, Position Pos,
-                clangd::CodeCompleteOptions Opts,
-                llvm::Optional<StringRef> OverridenContents = llvm::None);
+Tagged<CompletionList> runCodeComplete(ClangdServer &Server, PathRef File,
+                                       Position Pos,
+                                       clangd::CodeCompleteOptions Opts);
 
 llvm::Expected<Tagged<SignatureHelp>>
-runSignatureHelp(ClangdServer &Server, PathRef File, Position Pos,
-                 llvm::Optional<StringRef> OverridenContents = llvm::None);
+runSignatureHelp(ClangdServer &Server, PathRef File, Position Pos);
 
 llvm::Expected<Tagged<std::vector<Location>>>
 runFindDefinitions(ClangdServer &Server, PathRef File, Position Pos);