clangd: Do not report inline overrides twice

[ckandeler]

Summary

... in textDocument/references.

[ckandeler]

Fixed formatting.

[ckandeler]

Re-formatting, take two.

[sammccall]

Thanks!

[ckandeler]

Can you please merge it, too?

[ckandeler]

Thanks!

clang-tools-extra/clangd/XRefs.cpp

for (const auto &Ref : MainFileRefs) {
             ReferencesResult::Definition | ReferencesResult::Declaration;
       Results.References.push_back(std::move(Result));
     }
     // Add decl/def of overridding methods.
     if (Index && Results.References.size() <= Limit &&
         !OverriddenBy.Subjects.empty())
       Index->relations(
           OverriddenBy, [&](const SymbolID &Subject, const Symbol &Object) {
-            if (auto LSPLoc =
-                    toLSPLocation(Object.CanonicalDeclaration, *MainFilePath)) {
+            const auto LSPLocDecl =
+                toLSPLocation(Object.CanonicalDeclaration, *MainFilePath);
+            const auto LSPLocDef =
+                toLSPLocation(Object.Definition, *MainFilePath);
+            if (LSPLocDecl && LSPLocDecl != LSPLocDef) {
               ReferencesResult::Reference Result;
-              Result.Loc = std::move(*LSPLoc);
+              Result.Loc = std::move(*LSPLocDecl);
               Result.Attributes =
                   ReferencesResult::Declaration | ReferencesResult::Override;
               Results.References.push_back(std::move(Result));
             }
-            if (auto LSPLoc = toLSPLocation(Object.Definition, *MainFilePath)) {
+            if (LSPLocDef) {
               ReferencesResult::Reference Result;
-              Result.Loc = std::move(*LSPLoc);
+              Result.Loc = std::move(*LSPLocDef);
               Result.Attributes = ReferencesResult::Declaration |
                                   ReferencesResult::Definition |
                                   ReferencesResult::Override;
               Results.References.push_back(std::move(Result));
             }
           });
 
     if (Index && Results.References.size() <= Limit) {

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

llvm::StringRef Test =
         public:
           virtual void $decl[[f^unc]]() = 0;
         };
         class Derived : public Base {
         public:
           void $overridedecl[[func]]() override;
         };
         void Derived::$overridedef[[func]]() {}
+        class Derived2 : public Base {
+          void $overridedef[[func]]() override {}
+        };
         void test(Derived* D) {
           D->func();  // No references to the overrides.
         })cpp";
   checkFindRefs(Test, /*UseIndex=*/true);
 }
 
 TEST(FindReferences, RefsToBaseMethod) {
   llvm::StringRef Test =