diff options
| -rw-r--r-- | clang-tools-extra/clangd/CodeComplete.cpp | 2 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/CodeComplete.h | 3 | ||||
| -rw-r--r-- | clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp | 9 |
3 files changed, 5 insertions, 9 deletions
diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp index fe74dbd9863..cea20ab0538 100644 --- a/clang-tools-extra/clangd/CodeComplete.cpp +++ b/clang-tools-extra/clangd/CodeComplete.cpp @@ -643,7 +643,7 @@ clang::CodeCompleteOptions CodeCompleteOptions::getClangCompleteOpts() const { clang::CodeCompleteOptions Result; Result.IncludeCodePatterns = EnableSnippets && IncludeCodePatterns; Result.IncludeMacros = IncludeMacros; - Result.IncludeGlobals = IncludeGlobals; + Result.IncludeGlobals = true; Result.IncludeBriefComments = IncludeBriefComments; // When an is used, Sema is responsible for completing the main file, diff --git a/clang-tools-extra/clangd/CodeComplete.h b/clang-tools-extra/clangd/CodeComplete.h index 52ec01880c5..fec206e2d55 100644 --- a/clang-tools-extra/clangd/CodeComplete.h +++ b/clang-tools-extra/clangd/CodeComplete.h @@ -45,9 +45,6 @@ struct CodeCompleteOptions { /// Add macros to code completion results. bool IncludeMacros = true; - /// Add globals to code completion results. - bool IncludeGlobals = true; - /// Add brief comments to completion items, if available. /// FIXME(ibiryukov): it looks like turning this option on significantly slows /// down completion, investigate if it can be made faster. diff --git a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp index e81be67da44..b235549724f 100644 --- a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp +++ b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp @@ -277,10 +277,10 @@ void TestGlobalScopeCompletion(clangd::CodeCompleteOptions Opts) { EXPECT_THAT(Results.items, Not(AnyOf(Has("method"), Has("method()"), Has("field")))); // Global items. - EXPECT_IFF(Opts.IncludeGlobals, Results.items, - AllOf(Has("global_var"), - Has(Opts.EnableSnippets ? "global_func()" : "global_func"), - Has("GlobalClass"))); + EXPECT_THAT(Results.items, + AllOf(Has("global_var"), + Has(Opts.EnableSnippets ? "global_func()" : "global_func"), + Has("GlobalClass"))); // A macro. EXPECT_IFF(Opts.IncludeMacros, Results.items, Has("MACRO")); // Local items. Must be present always. @@ -300,7 +300,6 @@ TEST(CompletionTest, CompletionOptions) { // We used to test every combination of options, but that got too slow (2^N). auto Flags = { &clangd::CodeCompleteOptions::IncludeMacros, - &clangd::CodeCompleteOptions::IncludeGlobals, &clangd::CodeCompleteOptions::IncludeBriefComments, &clangd::CodeCompleteOptions::EnableSnippets, &clangd::CodeCompleteOptions::IncludeCodePatterns, |
