rebase updates

Author: MythreyaK

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

@@ -3277,7 +3277,7 @@ TEST(SignatureHelpTest, SkipExplicitObjectParameter) {
       A a {};
       a.foo($c1^);
       (&A::bar)($c2^);
-      // TODO: (&A::foo)(^c3)
+      (&A::foo)($c3^);
     }
   )cpp");
 
@@ -3294,18 +3294,27 @@ TEST(SignatureHelpTest, SkipExplicitObjectParameter) {
     const auto Result = signatureHelp(testPath(TU.Filename), Code.point("c1"),
                                       *Preamble, Inputs, MarkupKind::PlainText);
 
-    EXPECT_EQ(1, Result.signatures.size());
+    EXPECT_EQ(1U, Result.signatures.size());
 
     EXPECT_THAT(Result.signatures[0], AllOf(sig("foo([[int arg]]) -> void")));
   }
   {
     const auto Result = signatureHelp(testPath(TU.Filename), Code.point("c2"),
                                       *Preamble, Inputs, MarkupKind::PlainText);
 
-    EXPECT_EQ(1, Result.signatures.size());
+    EXPECT_EQ(1U, Result.signatures.size());
 
     EXPECT_THAT(Result.signatures[0], AllOf(sig("([[A]], [[int]]) -> void")));
   }
+  {
+    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]]) ->
+    // void")));
+  }
 }
 
 TEST(CompletionTest, IncludedCompletionKinds) {
@@ -4415,9 +4424,9 @@ TEST(CompletionTest, SkipExplicitObjectParameter) {
 
     int main() {
       A a {};
-      a.$c1^s
+      a.$c1^
       (&A::ba$c2^;
-      // TODO: (&A::fo$c3^
+      (&A::fo$c3^;
     }
   )cpp");
 
@@ -4435,11 +4444,11 @@ 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("(${1:int arg})")),
-                                     AllOf(named("bar"), signature("(int arg)"),
-                                           snippetSuffix("(${1:int arg})"))));
+    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"),
@@ -4449,6 +4458,14 @@ TEST(CompletionTest, SkipExplicitObjectParameter) {
                 ElementsAre(AllOf(named("bar"), signature("(int arg)"),
                                   snippetSuffix(""))));
   }
+  {
+    auto Result = codeComplete(testPath(TU.Filename), Code.point("c3"),
+                               Preamble.get(), Inputs, Opts);
+    EXPECT_THAT(
+        Result.Completions,
+        ElementsAre(AllOf(named("foo"), signature("<class self:auto>(int arg)"),
+                          snippetSuffix("<${1:class self:auto}>"))));
+  }
 }
 } // namespace
 } // namespace clangd

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

@@ -28,15 +28,17 @@ int func2() {
 // CHECK-CC2: OVERLOAD: [#void#]foo(int arg)
 
 int func3() {
-  // TODO: (&A::foo)
+  (&A::foo)
   (&A::bar)
 }
-// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-2):10 -std=c++23 %s | FileCheck -check-prefix=CHECK-CC3 %s
-// CHECK-CC3: COMPLETION: bar : [#void#]bar(<#int arg#>)
+// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-3):10 -std=c++23 %s | FileCheck -check-prefix=CHECK-CC3 %s
+// CHECK-CC3: COMPLETION: foo : [#void#]foo<<#class self:auto#>>(<#int arg#>)
+// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-4):10 -std=c++23 %s | FileCheck -check-prefix=CHECK-CC4 %s
+// CHECK-CC4: COMPLETION: bar : [#void#]bar(<#int arg#>)
 
 int func4() {
-  // TODO: (&A::foo)(
+  // TODO (&A::foo)(
   (&A::bar)(
 }
-// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-2):13 -std=c++23 %s | FileCheck -check-prefix=CHECK-CC4 %s
-// CHECK-CC4: OVERLOAD: [#void#](<#A#>, int)
+// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-2):13 -std=c++23 %s | FileCheck -check-prefix=CHECK-CC5 %s
+// CHECK-CC5: OVERLOAD: [#void#](<#A#>, int)