From 93483e7f39f99bc20e3e9bbe5506617c6973c7c3 Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Fri, 12 Jan 2018 17:09:49 +0000 Subject: [PATCH] [clangd] Include debugging tags for both static and dynamic index. NFC llvm-svn: 322379 --- clang-tools-extra/clangd/CodeComplete.cpp | 4 ++-- clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp index 48522ebcd2e3..e2fc5019708f 100644 --- a/clang-tools-extra/clangd/CodeComplete.cpp +++ b/clang-tools-extra/clangd/CodeComplete.cpp @@ -671,10 +671,10 @@ CompletionList codeComplete(const Context &Ctx, PathRef FileName, // 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; } diff --git a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp index 1cc95e9fb35f..39f9117ae045 100644 --- a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp +++ b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp @@ -526,8 +526,8 @@ TEST(CompletionTest, StaticAndDynamicIndex) { 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) {