diff options
| -rw-r--r-- | clang-tools-extra/clangd/CodeComplete.cpp | 6 | ||||
| -rw-r--r-- | clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp index f4f6c39e292..c0725fa633a 100644 --- a/clang-tools-extra/clangd/CodeComplete.cpp +++ b/clang-tools-extra/clangd/CodeComplete.cpp @@ -270,12 +270,14 @@ struct CodeCompletionBuilder { if (C.SemaResult) { Completion.Origin |= SymbolOrigin::AST; Completion.Name = llvm::StringRef(SemaCCS->getTypedText()); - if (Completion.Scope.empty()) - if (C.SemaResult->Kind == CodeCompletionResult::RK_Declaration) + if (Completion.Scope.empty()) { + if ((C.SemaResult->Kind == CodeCompletionResult::RK_Declaration) || + (C.SemaResult->Kind == CodeCompletionResult::RK_Pattern)) if (const auto *D = C.SemaResult->getDeclaration()) if (const auto *ND = llvm::dyn_cast<NamedDecl>(D)) Completion.Scope = splitQualifiedName(printQualifiedName(*ND)).first; + } Completion.Kind = toCompletionItemKind(C.SemaResult->Kind, C.SemaResult->Declaration); } diff --git a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp index 86a5f415163..fa6a1bae2cd 100644 --- a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp +++ b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp @@ -1309,6 +1309,18 @@ TEST(CompletionTest, IgnoreRecoveryResults) { EXPECT_THAT(Results.Completions, UnorderedElementsAre(Named("NotRecovered"))); } +TEST(CompletionTest, ScopeOfClassFieldInConstructorInitializer) { + auto Results = completions( + R"cpp( + namespace ns { + class X { public: X(); int x_; }; + X::X() : x_^(0) {} + } + )cpp"); + EXPECT_THAT(Results.Completions, + UnorderedElementsAre(AllOf(Scope("ns::X::"), Named("x_")))); +} + } // namespace } // namespace clangd } // namespace clang |
