[clang-tools-extra] r322379 - [clangd] Include debugging tags for both static and dynamic index. NFC

Sam McCall via cfe-commits cfe-commits at lists.llvm.org
Fri Jan 12 09:09:49 PST 2018


Author: sammccall
Date: Fri Jan 12 09:09:49 2018
New Revision: 322379

URL: http://llvm.org/viewvc/llvm-project?rev=322379&view=rev
Log:
[clangd] Include debugging tags for both static and dynamic index. NFC

Modified:
    clang-tools-extra/trunk/clangd/CodeComplete.cpp
    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=322379&r1=322378&r2=322379&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/CodeComplete.cpp (original)
+++ clang-tools-extra/trunk/clangd/CodeComplete.cpp Fri Jan 12 09:09:49 2018
@@ -671,10 +671,10 @@ CompletionList codeComplete(const Contex
     // engine).
     if (Opts.Index)
       completeWithIndex(Ctx, *Opts.Index, Contents, *CompletedName.SSInfo,
-                        CompletedName.Filter, &Results);
+                        CompletedName.Filter, &Results, /*DebuggingLabel=*/"D");
     if (Opts.StaticIndex)
       completeWithIndex(Ctx, *Opts.StaticIndex, Contents, *CompletedName.SSInfo,
-                        CompletedName.Filter, &Results, /*DebuggingLabel=*/"G");
+                        CompletedName.Filter, &Results, /*DebuggingLabel=*/"S");
   }
   return Results;
 }

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=322379&r1=322378&r2=322379&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp (original)
+++ clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp Fri Jan 12 09:09:49 2018
@@ -526,8 +526,8 @@ TEST(CompletionTest, StaticAndDynamicInd
       void f() { ::ns::^ }
   )cpp",
                              Opts);
-  EXPECT_THAT(Results.items, Contains(Labeled("[G]XYZ")));
-  EXPECT_THAT(Results.items, Contains(Labeled("foo")));
+  EXPECT_THAT(Results.items, Contains(Labeled("[S]XYZ")));
+  EXPECT_THAT(Results.items, Contains(Labeled("[D]foo")));
 }
 
 TEST(CompletionTest, SimpleIndexBased) {




More information about the cfe-commits mailing list