Only give overrides on ObjC method defs

Author: DavidGoldman

clang-tools-extra/clangd/XRefs.cpp

@@ -439,14 +439,16 @@ locateASTReferent(SourceLocation CurLoc, const syntax::Token *TouchedIdentifier,
         continue;
       }
     }
-    // Special case: - (void)^method; should jump to overrides. Note that an
-    // Objective-C method can override a parent class or protocol.
+    // Special case: - (void)^method {} should jump to overrides, but the decl
+    // shouldn't, only the definition. Note that an Objective-C method can
+    // override a parent class or protocol.
     //
     // FIXME: Support jumping from a protocol decl to overrides on go-to
     // definition.
     if (const auto *OMD = llvm::dyn_cast<ObjCMethodDecl>(D)) {
       if (TouchedIdentifier &&
-          objcMethodIsTouched(SM, OMD, TouchedIdentifier->location())) {
+          objcMethodIsTouched(SM, OMD, TouchedIdentifier->location()) &&
+          OMD->isThisDeclarationADefinition()) {
         llvm::SmallVector<const ObjCMethodDecl *, 4> Overrides;
         OMD->getOverriddenMethods(Overrides);
         if (!Overrides.empty()) {

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

@@ -411,7 +411,7 @@ TEST(LocateSymbol, FindOverrides) {
                                    sym("foo", Code.range("2"), std::nullopt)));
 }
 
-TEST(LocateSymbol, FindOverridesObjC) {
+TEST(LocateSymbol, FindOverridesFromDefObjC) {
   auto Code = Annotations(R"objc(
     @protocol Fooey
     - (void)foo;
@@ -439,6 +439,33 @@ TEST(LocateSymbol, FindOverridesObjC) {
                            sym("foo", Code.range("2"), Code.range("3"))));
 }
 
+TEST(LocateSymbol, NoOverridesFromDeclObjC) {
+  auto Code = Annotations(R"objc(
+    @protocol Fooey
+    - (void)foo;
+    @end
+    @interface Base
+    - (void)foo;
+    @end
+    @interface Foo : Base<Fooey>
+    - (void)foo;
+    @end
+
+    @interface Bar : Foo
+    - (void)$2[[fo^o]];
+    @end
+    @implementation Bar
+    - (void)$3[[foo]] {}
+    @end
+  )objc");
+  TestTU TU = TestTU::withCode(Code.code());
+  TU.ExtraArgs.push_back("-xobjective-c++");
+  auto AST = TU.build();
+  EXPECT_THAT(
+      locateSymbolAt(AST, Code.point(), TU.index().get()),
+      UnorderedElementsAre(sym("foo", Code.range("2"), Code.range("3"))));
+}
+
 TEST(LocateSymbol, ObjCNoOverridesOnUsage) {
   auto Code = Annotations(R"objc(
     @interface Foo