[clang] Use correct visibility parameters when following a Using declaration

[furkanusta]

Summary

Fixes clangd issue #1137

[furkanusta]

I wasn't sure if I should add a URL to the commit message for easy access but here is the corresponding clangd issue: https://github.com/clangd/clangd/issues/1137

[kadircet]

clang/lib/Sema/SemaCodeComplete.cpp

1271

can you also update MaybeAddResult around line 1096.

[kadircet]

Also if you put Fixes https://github.com/clangd/clangd/issues/1137 in the commit message, it'll automatically close the issue.

[furkanusta]

[clang] Use correct visibility parameters when following a Using declaration

Fixes https://github.com/clangd/clangd/issues/1137

[kadircet]

thanks, lgtm!

do you have commit access or should i land this for you? if i should, can you provide an email address for attribution of the commit

[furkanusta]

I don't think I have a commit access this is my first contribution. I appreciate if you can do it for me.

My mail address is: [e-mail]

I had my github account linked and expecting for my mail to get fetched automatically.
To make things easier should I sign my commits in the future or is there a variable that I can set in the Arcanist tool?

[kadircet]

thanks! you're right, it was already included in the arcanist metadata, i
was too lazy to check beforehand, sorry.

clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp

auto External = completions(R"cpp(
       };
       void test() {
         Foo F;
         F.^
       }
   )cpp");
   EXPECT_THAT(External.Completions,
               AllOf(has("pub"), Not(has("prot")), Not(has("priv"))));
+
+  auto Results = completions(R"cpp(
+      struct Foo {
+        public: void pub();
+        protected: void prot();
+        private: void priv();
+      };
+      struct Bar : public Foo {
+        private: using Foo::pub;
+      };
+      void test() {
+        Bar B;
+        B.^
+      }
+  )cpp");
+  EXPECT_THAT(Results.Completions,
+              AllOf(Not(has("priv")), Not(has("prot")), Not(has("pub"))));
 }
 
 TEST(CompletionTest, Qualifiers) {
   auto Results = completions(R"cpp(
       class Foo {
         public: int foo() const;
         int bar() const;
       };

clang/lib/Sema/SemaCodeComplete.cpp

if (R.Kind != Result::RK_Declaration) {
     Results.push_back(R);
     return;
   }
 
   // Look through using declarations.
   if (const UsingShadowDecl *Using = dyn_cast<UsingShadowDecl>(R.Declaration)) {
     CodeCompletionResult Result(Using->getTargetDecl(),
                                 getBasePriority(Using->getTargetDecl()),
-                                R.Qualifier);
+                                R.Qualifier, false,
+                                (R.Availability == CXAvailability_Available ||
+                                 R.Availability == CXAvailability_Deprecated));
     Result.ShadowDecl = Using;
     MaybeAddResult(Result, CurContext);
     return;
   }
 
   const Decl *CanonDecl = R.Declaration->getCanonicalDecl();
   unsigned IDNS = CanonDecl->getIdentifierNamespace();
 
void ResultBuilder::AddResult(Result R, DeclContext *CurContext,
   if (R.Kind != Result::RK_Declaration) {
     // For non-declaration results, just add the result.
     Results.push_back(R);
     return;
   }
 
   // Look through using declarations.
   if (const auto *Using = dyn_cast<UsingShadowDecl>(R.Declaration)) {
     CodeCompletionResult Result(Using->getTargetDecl(),
                                 getBasePriority(Using->getTargetDecl()),
-                                R.Qualifier);
+                                R.Qualifier, false,
+                                (R.Availability == CXAvailability_Available ||
+                                 R.Availability == CXAvailability_Deprecated));
     Result.ShadowDecl = Using;
     AddResult(Result, CurContext, Hiding);
     return;
   }
 
   bool AsNestedNameSpecifier = false;
   if (!isInterestingDecl(R.Declaration, AsNestedNameSpecifier))
     return;