hover-layout-everyhere: Do not show record decls

3 files changed, 9 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa25b89ddfb8..a2c8ff54ac73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = clangd-opt
 	pkgdesc = Trunk version of standalone clangd binary, with custom patches (look AUR page or PKGBUILD comments)
 	pkgver = 17.0.0.r19.g4b414e52ac10
-	pkgrel = 37
+	pkgrel = 38
 	url = https://llvm.org/
 	arch = x86_64
 	license = custom:Apache 2.0 with LLVM Exception
@@ -52,7 +52,7 @@ pkgbase = clangd-opt
 	sha256sums = ba47bb7ac05487a5a083094247eaa369f89404924172a4af40147507b15b90aa
 	sha256sums = e0c86d8cd1d1c4d68c07ed5843593a51607a268c39ccd76e7fe17bc168bf16f4
 	sha256sums = 1b1ad88faa83b36dd68f63851a0fd6e07eed16595fcbffdc8a57b5c884f8a98c
-	sha256sums = 154cbe13075c1baf34f8c34008e291ecbf1e6fd30bd144fd0f49ac6cc1fdda1a
+	sha256sums = 62e38f3074f39d51524b3d43aabb3991df97e43ea4a8c20e8073c479a41d1057
 	sha256sums = 94b328ea81eb615a90acf18a9a78733d77093deb12203683510fe4881bad95c6
 	sha256sums = 24a8e0b207598798b91f030bcccf0a074f0ccd23885ea4e802a8bda1c05657e0
 	sha256sums = 6e1f9c9a01ac50be93537227fffe20816ae0d51243ca8836c39d99dec8dad51e
diff --git a/PKGBUILD b/PKGBUILD
index febe9269ebbe..4bb9ec36f161 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -120,7 +120,7 @@
 
 pkgname=clangd-opt
 pkgver=17.0.0.r19.g4b414e52ac10
-pkgrel=37
+pkgrel=38
 pkgdesc='Trunk version of standalone clangd binary, with custom patches (look AUR page or PKGBUILD comments)'
 arch=('x86_64')
 url="https://llvm.org/"
@@ -163,7 +163,7 @@ sha256sums=('SKIP'
             'ba47bb7ac05487a5a083094247eaa369f89404924172a4af40147507b15b90aa'  # hover-hex-formats
             'e0c86d8cd1d1c4d68c07ed5843593a51607a268c39ccd76e7fe17bc168bf16f4'  # hover-bit-fields-mask
             '1b1ad88faa83b36dd68f63851a0fd6e07eed16595fcbffdc8a57b5c884f8a98c'  # hover-virt-offset
-            '154cbe13075c1baf34f8c34008e291ecbf1e6fd30bd144fd0f49ac6cc1fdda1a'  # hover-layout-everyhere
+            '62e38f3074f39d51524b3d43aabb3991df97e43ea4a8c20e8073c479a41d1057'  # hover-layout-everyhere
             '94b328ea81eb615a90acf18a9a78733d77093deb12203683510fe4881bad95c6'  # hover-no-defs
             '24a8e0b207598798b91f030bcccf0a074f0ccd23885ea4e802a8bda1c05657e0'  # hover-ptrfn-args
             '6e1f9c9a01ac50be93537227fffe20816ae0d51243ca8836c39d99dec8dad51e'  # resolve-depend-type
diff --git a/hover-layout-everyhere.patch b/hover-layout-everyhere.patch
index df7754eb27c3..10988c5dd17e 100644
--- a/hover-layout-everyhere.patch
+++ b/hover-layout-everyhere.patch
@@ -1,15 +1,13 @@
 diff --git a/clang-tools-extra/clangd/Hover.cpp b/clang-tools-extra/clangd/Hover.cpp
-index d03e634f7..8eac0e974 100644
+index a868d3bb4e3f..db7e0fa6ddbc 100644
 --- a/clang-tools-extra/clangd/Hover.cpp
 +++ b/clang-tools-extra/clangd/Hover.cpp
-@@ -1497,9 +1497,7 @@ std::optional<HoverInfo> getHover(ParsedAST &AST, Position Pos,
-       if (const auto *DeclToUse = pickDeclToUse(Decls)) {
+@@ -1364,7 +1364,7 @@ std::optional<HoverInfo> getHover(ParsedAST &AST, Position Pos,
          HoverCountMetric.record(1, "decl");
          HI = getHoverContents(DeclToUse, PP, Index, TB);
--        // Layout info only shown when hovering on the field/class itself.
+         // Layout info only shown when hovering on the field/class itself.
 -        if (DeclToUse == N->ASTNode.get<Decl>())
--          addLayoutInfo(*DeclToUse, *HI);
-+        addLayoutInfo(*DeclToUse, *HI);
++        if (DeclToUse == N->ASTNode.get<Decl>() || llvm::dyn_cast<RecordDecl>(DeclToUse) == nullptr)
+           addLayoutInfo(*DeclToUse, *HI);
          // Look for a close enclosing expression to show the value of.
          if (!HI->Value)
-           HI->Value = printExprValue(N, AST.getASTContext()).PrintedValue;