code review

Author: MythreyaK

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

@@ -3307,12 +3307,12 @@ TEST(SignatureHelpTest, SkipExplicitObjectParameter) {
     EXPECT_THAT(Result.signatures[0], AllOf(sig("([[A]], [[int]]) -> void")));
   }
   {
+    // TODO: llvm/llvm-project/146649
     const auto Result = signatureHelp(testPath(TU.Filename), Code.point("c3"),
                                       *Preamble, Inputs, MarkupKind::PlainText);
-    // TODO: We expect 1 signature here
-    // EXPECT_EQ(1U, Result.signatures.size());
-
-    // EXPECT_THAT(Result.signatures[0], AllOf(sig("([[A]], [[int]]) ->
+    // TODO: We expect 1 signature here, with this signature
+    EXPECT_EQ(0U, Result.signatures.size());
+    // EXPECT_THAT(Result.signatures[0], AllOf(sig("([[A&&]], [[int]]) ->
     // void")));
   }
 }
@@ -4424,12 +4424,19 @@ TEST(CompletionTest, SkipExplicitObjectParameter) {
 
     int main() {
       A a {};
-      a.$c1^
-      (&A::ba$c2^;
-      (&A::fo$c3^;
+      a.$c1^;
+      (&A::fo$c2^;
+      (&A::ba$c3^;
     }
   )cpp");
 
+  // TODO: llvm/llvm-project/146649
+  // This is incorrect behavior. Correct Result should be a variant of,
+  // c2: signature = (A&& self, int arg)
+  //     snippet = (${1: A&& self}, ${2: int arg})
+  // c3: signature = (A self, int arg)
+  //     snippet = (${1: A self}, ${2: int arg})
+
   auto TU = TestTU::withCode(Code.code());
   TU.ExtraArgs = {"-std=c++23"};
 
@@ -4444,28 +4451,27 @@ TEST(CompletionTest, SkipExplicitObjectParameter) {
     auto Result = codeComplete(testPath(TU.Filename), Code.point("c1"),
                                Preamble.get(), Inputs, Opts);
 
-    EXPECT_THAT(
-        Result.Completions,
-        UnorderedElementsAre(
-            AllOf(named("foo"), signature("(int arg)"), snippetSuffix("")),
-            AllOf(named("bar"), signature("(int arg)"), snippetSuffix(""))));
-  }
-  {
-    auto Result = codeComplete(testPath(TU.Filename), Code.point("c2"),
-                               Preamble.get(), Inputs, Opts);
-    // TODO: snippet suffix is empty for c2
     EXPECT_THAT(Result.Completions,
-                ElementsAre(AllOf(named("bar"), signature("(int arg)"),
-                                  snippetSuffix(""))));
+                UnorderedElementsAre(AllOf(named("foo"), signature("(int arg)"),
+                                           snippetSuffix("(${1:int arg})")),
+                                     AllOf(named("bar"), signature("(int arg)"),
+                                           snippetSuffix("(${1:int arg})"))));
   }
   {
-    auto Result = codeComplete(testPath(TU.Filename), Code.point("c3"),
+    auto Result = codeComplete(testPath(TU.Filename), Code.point("c2"),
                                Preamble.get(), Inputs, Opts);
     EXPECT_THAT(
         Result.Completions,
         ElementsAre(AllOf(named("foo"), signature("<class self:auto>(int arg)"),
                           snippetSuffix("<${1:class self:auto}>"))));
   }
+  {
+    auto Result = codeComplete(testPath(TU.Filename), Code.point("c3"),
+                               Preamble.get(), Inputs, Opts);
+    EXPECT_THAT(Result.Completions,
+                ElementsAre(AllOf(named("bar"), signature("(int arg)"),
+                                  snippetSuffix(""))));
+  }
 }
 } // namespace
 } // namespace clangd

clang/test/CodeCompletion/skip-explicit-object-parameter.cpp

@@ -27,6 +27,10 @@ int func2() {
 // RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-2):9 -std=c++23 %s | FileCheck -check-prefix=CHECK-CC2 %s
 // CHECK-CC2: OVERLOAD: [#void#]foo(int arg)
 
+// TODO: llvm/llvm-project/146649
+// This is incorrect behavior. Correct Result should be a variant of, 
+// CC3: should be something like [#void#]foo(<#A self#>, <#int arg#>)
+// CC4: should be something like [#void#]bar(<#A self#>, <#int arg#>)
 int func3() {
   (&A::foo)
   (&A::bar)