diff options
| -rw-r--r-- | clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp | 19 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 3 | ||||
| -rw-r--r-- | clang/test/CodeCompletion/member-access-qualifiers.cpp | 13 |
3 files changed, 35 insertions, 0 deletions
diff --git a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp index 6e4322eff5d..4cfb1a2d631 100644 --- a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp +++ b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp @@ -2546,6 +2546,25 @@ TEST(CompletionTest, NamespaceDoubleInsertion) { UnorderedElementsAre(AllOf(Qualifier(""), Named("ABCDE")))); } +TEST(CompletionTest, DerivedMethodsAreAlwaysVisible) { + // Despite the fact that base method matches the ref-qualifier better, + // completion results should only include the derived method. + auto Completions = completions(R"cpp( + struct deque_base { + float size(); + double size() const; + }; + struct deque : deque_base { + int size() const; + }; + + auto x = deque().^ + )cpp") + .Completions; + EXPECT_THAT(Completions, + ElementsAre(AllOf(ReturnType("int"), Named("size")))); +} + TEST(NoCompileCompletionTest, Basic) { auto Results = completionsNoCompile(R"cpp( void func() { diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index e4bbee86e35..f24c3b234ff 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -1185,6 +1185,9 @@ static OverloadCompare compareOverloads(const CXXMethodDecl &Candidate, const CXXMethodDecl &Incumbent, const Qualifiers &ObjectQuals, ExprValueKind ObjectKind) { + // Base/derived shadowing is handled elsewhere. + if (Candidate.getDeclContext() != Incumbent.getDeclContext()) + return OverloadCompare::BothViable; if (Candidate.isVariadic() != Incumbent.isVariadic() || Candidate.getNumParams() != Incumbent.getNumParams() || Candidate.getMinRequiredArguments() != diff --git a/clang/test/CodeCompletion/member-access-qualifiers.cpp b/clang/test/CodeCompletion/member-access-qualifiers.cpp new file mode 100644 index 00000000000..93af02c2390 --- /dev/null +++ b/clang/test/CodeCompletion/member-access-qualifiers.cpp @@ -0,0 +1,13 @@ +struct deque_base { + int &size(); + const int &size() const; +}; + +struct deque : private deque_base { + int size() const; +}; + +auto x = deque(). +// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:10:18 %s -o - | FileCheck %s +// CHECK: COMPLETION: size : [#int#]size()[# const#] +// CHECK: COMPLETION: size (Hidden,InBase,Inaccessible) : [#int &#]deque_base::size() |
