[clang-tools-extra] r322856 - [clangd] Remove unused IncludeGlobals completion option, always pass true to sema

[Sam McCall via cfe-commits]

Author: sammccall
Date: Thu Jan 18 07:31:30 2018
New Revision: 322856

URL: http://llvm.org/viewvc/llvm-project?rev=322856&view=rev
Log:
[clangd] Remove unused IncludeGlobals completion option, always pass true to sema

Modified:
    clang-tools-extra/trunk/clangd/CodeComplete.cpp
    clang-tools-extra/trunk/clangd/CodeComplete.h
    clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp

Modified: clang-tools-extra/trunk/clangd/CodeComplete.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/CodeComplete.cpp?rev=322856&r1=322855&r2=322856&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/CodeComplete.cpp (original)
+++ clang-tools-extra/trunk/clangd/CodeComplete.cpp Thu Jan 18 07:31:30 2018
@@ -643,7 +643,7 @@ clang::CodeCompleteOptions CodeCompleteO
   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,

Modified: clang-tools-extra/trunk/clangd/CodeComplete.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/CodeComplete.h?rev=322856&r1=322855&r2=322856&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/CodeComplete.h (original)
+++ clang-tools-extra/trunk/clangd/CodeComplete.h Thu Jan 18 07:31:30 2018
@@ -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.

Modified: clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp?rev=322856&r1=322855&r2=322856&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp (original)
+++ clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp Thu Jan 18 07:31:30 2018
@@ -277,10 +277,10 @@ void TestGlobalScopeCompletion(clangd::C
   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,