Author: Sam McCall Date: 2020-03-03T14:53:59+01:00 New Revision: c0b27c489104f6c3c055a3ac1573d05393fe32eb
URL: https://github.com/llvm/llvm-project/commit/c0b27c489104f6c3c055a3ac1573d05393fe32eb DIFF: https://github.com/llvm/llvm-project/commit/c0b27c489104f6c3c055a3ac1573d05393fe32eb.diff LOG: [clangd] Remove unused getDocument() API Added: Modified: clang-tools-extra/clangd/ClangdServer.cpp clang-tools-extra/clangd/ClangdServer.h clang-tools-extra/clangd/TUScheduler.cpp clang-tools-extra/clangd/TUScheduler.h clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/ClangdServer.cpp b/clang-tools-extra/clangd/ClangdServer.cpp index f1a88902c8c0..5dd00322a5ab 100644 --- a/clang-tools-extra/clangd/ClangdServer.cpp +++ b/clang-tools-extra/clangd/ClangdServer.cpp @@ -194,10 +194,6 @@ void ClangdServer::addDocument(PathRef File, llvm::StringRef Contents, void ClangdServer::removeDocument(PathRef File) { WorkScheduler.remove(File); } -llvm::StringRef ClangdServer::getDocument(PathRef File) const { - return WorkScheduler.getContents(File); -} - void ClangdServer::codeComplete(PathRef File, Position Pos, const clangd::CodeCompleteOptions &Opts, Callback<CodeCompleteResult> CB) { diff --git a/clang-tools-extra/clangd/ClangdServer.h b/clang-tools-extra/clangd/ClangdServer.h index e9f2c30b1749..d098f6242f72 100644 --- a/clang-tools-extra/clangd/ClangdServer.h +++ b/clang-tools-extra/clangd/ClangdServer.h @@ -175,9 +175,6 @@ class ClangdServer { WantDiagnostics WD = WantDiagnostics::Auto, bool ForceRebuild = false); - /// Get the contents of \p File, which should have been added. - llvm::StringRef getDocument(PathRef File) const; - /// Remove \p File from list of tracked files, schedule a request to free /// resources associated with it. Pending diagnostics for closed files may not /// be delivered, even if requested with WantDiags::Auto or WantDiags::Yes. diff --git a/clang-tools-extra/clangd/TUScheduler.cpp b/clang-tools-extra/clangd/TUScheduler.cpp index f59c19e8031e..3f3162a33c30 100644 --- a/clang-tools-extra/clangd/TUScheduler.cpp +++ b/clang-tools-extra/clangd/TUScheduler.cpp @@ -921,15 +921,6 @@ void TUScheduler::remove(PathRef File) { File); } -llvm::StringRef TUScheduler::getContents(PathRef File) const { - auto It = Files.find(File); - if (It == Files.end()) { - elog("getContents() for untracked file: {0}", File); - return ""; - } - return It->second->Contents; -} - llvm::StringMap<std::string> TUScheduler::getAllFileContents() const { llvm::StringMap<std::string> Results; for (auto &It : Files) diff --git a/clang-tools-extra/clangd/TUScheduler.h b/clang-tools-extra/clangd/TUScheduler.h index 5082612b0ccc..948fde7ed109 100644 --- a/clang-tools-extra/clangd/TUScheduler.h +++ b/clang-tools-extra/clangd/TUScheduler.h @@ -213,10 +213,6 @@ class TUScheduler { /// if requested with WantDiags::Auto or WantDiags::Yes. void remove(PathRef File); - /// Returns the current contents of the buffer for File, per last update(). - /// The returned StringRef may be invalidated by any write to TUScheduler. - llvm::StringRef getContents(PathRef File) const; - /// Returns a snapshot of all file buffer contents, per last update(). llvm::StringMap<std::string> getAllFileContents() const; diff --git a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp index 214099767990..9e5952fe2cb5 100644 --- a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp +++ b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp @@ -138,9 +138,7 @@ TEST_F(TUSchedulerTests, MissingFiles) { auto Missing = testPath("missing.cpp"); Files[Missing] = ""; - EXPECT_EQ(S.getContents(Added), ""); S.update(Added, getInputs(Added, "x"), WantDiagnostics::No); - EXPECT_EQ(S.getContents(Added), "x"); // Assert each operation for missing file is an error (even if it's // available in VFS). @@ -159,9 +157,7 @@ TEST_F(TUSchedulerTests, MissingFiles) { [&](Expected<InputsAndPreamble> Preamble) { EXPECT_TRUE(bool(Preamble)); }); - EXPECT_EQ(S.getContents(Added), "x"); S.remove(Added); - EXPECT_EQ(S.getContents(Added), ""); // Assert that all operations fail after removing the file. S.runWithAST("", Added, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
