Revert "Simplified filterSymbolTags:"

ratzdi · ratzdi · commit c39d64b9d01a · 2026-04-27T15:02:00.000+02:00
This reverts commit 86a41ca.
diff --git a/clang-tools-extra/clangd/FindSymbols.cpp b/clang-tools-extra/clangd/FindSymbols.cpp
@@ -203,20 +203,23 @@ SymbolTags filterSymbolTags(SymbolTags ST) {
   const SymbolTags AbstractMask = toSymbolTagBitmask(SymbolTag::Abstract);
   const SymbolTags FinalMask = toSymbolTagBitmask(SymbolTag::Final);
 
-  const SymbolTags RemoveVirtualAndOverrides = VirtualMask | OverridesMask;
-
-  // Implements implies both Overrides and Virtual.
+  // Implements implies Overrides + Virtual.
   if (ST & ImplementsMask)
-    ST &= ~RemoveVirtualAndOverrides;
+    ST &= ~(OverridesMask | VirtualMask);
 
-  // Final also suppresses both Virtual and Overrides in this model.
-  if (ST & FinalMask)
-    ST &= ~RemoveVirtualAndOverrides;
+  // Overrides implies Virtual.
+  if (ST & OverridesMask)
+    ST &= ~VirtualMask;
 
-  // Overrides or Abstract each imply Virtual.
-  if (ST & (OverridesMask | AbstractMask))
+  // Abstract implies Virtual.
+  if (ST & AbstractMask)
     ST &= ~VirtualMask;
 
+  // Final implies Virtual; Overrides is also redundant as Final overrides are
+  // still overrides.
+  if (ST & FinalMask)
+    ST &= ~(VirtualMask | OverridesMask);
+
   return ST;
 }
 
