[clang-tools-extra] [clangd] Avoid invalid include-fixer fuzzy-find queries (PR #212134)

[Macro Terra via cfe-commits]

https://github.com/hongtaihu updated https://github.com/llvm/llvm-project/pull/212134

>From 8d90ad6f5bd2a5f3be507ca5623828699404301c Mon Sep 17 00:00:00 2001
From: hongtaihu <13541229370 at qq.com>
Date: Mon, 27 Jul 2026 01:07:59 +0800
Subject: [PATCH] [clangd] Avoid invalid include-fixer fuzzy-find queries

---
 clang-tools-extra/clangd/IncludeFixer.cpp           | 11 +++++++++++
 .../clangd/unittests/DiagnosticsTests.cpp           | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/clang-tools-extra/clangd/IncludeFixer.cpp b/clang-tools-extra/clangd/IncludeFixer.cpp
index 5ecf853524a3f..40bae62d1a629 100644
--- a/clang-tools-extra/clangd/IncludeFixer.cpp
+++ b/clang-tools-extra/clangd/IncludeFixer.cpp
@@ -397,6 +397,17 @@ std::optional<std::string> getSpelledSpecifier(const CXXScopeSpec &SS,
 std::optional<CheapUnresolvedName> extractUnresolvedNameCheaply(
     const SourceManager &SM, const DeclarationNameInfo &Unresolved,
     CXXScopeSpec *SS, const LangOptions &LangOpts, bool UnresolvedIsSpecifier) {
+  // These names contain a type rather than an unqualified symbol name. The
+  // type may itself be qualified, and cannot be represented by Name + Scopes.
+  switch (Unresolved.getName().getNameKind()) {
+  case DeclarationName::CXXConstructorName:
+  case DeclarationName::CXXDestructorName:
+  case DeclarationName::CXXConversionFunctionName:
+    return std::nullopt;
+  default:
+    break;
+  }
+
   CheapUnresolvedName Result;
   Result.Name = Unresolved.getAsString();
   if (SS && SS->isNotEmpty()) { // "::" or "ns::"
diff --git a/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
index 6d91ac1ef1e8e..cb1612fbd318b 100644
--- a/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
+++ b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
@@ -1560,6 +1560,19 @@ TEST(IncludeFixerTest, NoCrashMemberAccess) {
       UnorderedElementsAre(Diag(Test.range(), "no member named 'xy' in 'X'")));
 }
 
+TEST(IncludeFixerTest, IgnoreSpecialDeclarationName) {
+  auto TU = TestTU::withCode(R"cpp(// error-ok
+namespace std {}
+void f() { operator new[](0, operator::align_val_t{}); }
+  )cpp");
+  TU.ExtraArgs.push_back("-std=c++17");
+  auto Index = buildIndexWithSymbol(
+      SymbolWithHeader{"std::align_val_t", "unittest:///new.h", "<new>"});
+  TU.ExternalIndex = Index.get();
+
+  EXPECT_THAT(TU.build().getDiagnostics(), Not(IsEmpty()));
+}
+
 TEST(IncludeFixerTest, UseCachedIndexResults) {
   // As index results for the identical request are cached, more than 5 fixes
   // are generated.