Author: Sam McCall Date: 2021-01-14T17:19:47+01:00 New Revision: 17fb21f875f4aaf6ad2cf9499cb75d76588167f2
URL: https://github.com/llvm/llvm-project/commit/17fb21f875f4aaf6ad2cf9499cb75d76588167f2 DIFF: https://github.com/llvm/llvm-project/commit/17fb21f875f4aaf6ad2cf9499cb75d76588167f2.diff LOG: [clangd] Remove another option that was effectively always true. NFC Added: Modified: clang-tools-extra/clangd/ClangdServer.cpp clang-tools-extra/clangd/CodeComplete.h clang-tools-extra/clangd/tool/ClangdMain.cpp clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/ClangdServer.cpp b/clang-tools-extra/clangd/ClangdServer.cpp index d5e21cfb063e..4f3a47dff05d 100644 --- a/clang-tools-extra/clangd/ClangdServer.cpp +++ b/clang-tools-extra/clangd/ClangdServer.cpp @@ -243,15 +243,11 @@ void ClangdServer::codeComplete(PathRef File, Position Pos, // No speculation in Fallback mode, as it's supposed to be much faster // without compiling. vlog("Build for file {0} is not ready. Enter fallback mode.", File); - } else { - if (CodeCompleteOpts.Index && CodeCompleteOpts.SpeculativeIndexRequest) { - SpecFuzzyFind.emplace(); - { - std::lock_guard<std::mutex> Lock( - CachedCompletionFuzzyFindRequestMutex); - SpecFuzzyFind->CachedReq = - CachedCompletionFuzzyFindRequestByFile[File]; - } + } else if (CodeCompleteOpts.Index) { + SpecFuzzyFind.emplace(); + { + std::lock_guard<std::mutex> Lock(CachedCompletionFuzzyFindRequestMutex); + SpecFuzzyFind->CachedReq = CachedCompletionFuzzyFindRequestByFile[File]; } } ParseInputs ParseInput{IP->Command, &TFS, IP->Contents.str()}; diff --git a/clang-tools-extra/clangd/CodeComplete.h b/clang-tools-extra/clangd/CodeComplete.h index f7ac3c7e5aba..ddcbd487ecc6 100644 --- a/clang-tools-extra/clangd/CodeComplete.h +++ b/clang-tools-extra/clangd/CodeComplete.h @@ -82,16 +82,6 @@ struct CodeCompleteOptions { /// Expose origins of completion items in the label (for debugging). bool ShowOrigins = false; - /// If set to true, this will send an asynchronous speculative index request, - /// based on the index request for the last code completion on the same file - /// and the filter text typed before the cursor, before sema code completion - /// is invoked. This can reduce the code completion latency (by roughly - /// latency of sema code completion) if the speculative request is the same as - /// the one generated for the ongoing code completion from sema. As a sequence - /// of code completions often have the same scopes and proximity paths etc, - /// this should be effective for a number of code completions. - bool SpeculativeIndexRequest = false; - // Populated internally by clangd, do not set. /// If `Index` is set, it is used to augment the code completion /// results. diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp index 9c75cafdb08e..d3859103b0f0 100644 --- a/clang-tools-extra/clangd/tool/ClangdMain.cpp +++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp @@ -828,7 +828,6 @@ clangd accepts flags on the commandline, and in the CLANGD_FLAGS environment var Opts.CodeComplete.IncludeIndicator.Insert.clear(); Opts.CodeComplete.IncludeIndicator.NoInsert.clear(); } - Opts.CodeComplete.SpeculativeIndexRequest = Opts.StaticIndex; Opts.CodeComplete.EnableFunctionArgSnippets = EnableFunctionArgSnippets; Opts.CodeComplete.AllScopes = AllScopesCompletion; Opts.CodeComplete.RunParser = CodeCompletionParse; diff --git a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp index 43a557d6c73e..9842bcb315e5 100644 --- a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp +++ b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp @@ -2339,7 +2339,6 @@ TEST(CompletionTest, EnableSpeculativeIndexRequest) { IndexRequestCollector Requests; Opts.Index = &Requests; - Opts.SpeculativeIndexRequest = true; auto CompleteAtPoint = [&](StringRef P) { cantFail(runCodeComplete(Server, File, Test.point(P), Opts)); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
