[clang] [clang-tools-extra] [clang][include cleaner] Fix MainHeader insertion issue (PR #212852)

Björn Schäpers via cfe-commits cfe-commits at lists.llvm.org
Wed Aug 26 03:21:24 PDT 2026


================
@@ -512,11 +516,86 @@ HeaderIncludes::insert(llvm::StringRef Header, bool IsAngled,
   return tooling::Replacement(FileName, InsertOffset, 0, NewInclude);
 }
 
-tooling::Replacements HeaderIncludes::remove(llvm::StringRef IncludeName,
+HeaderIncludes::HeaderToInsert::HeaderToInsert(StringRef RawOrSpelledHeader,
+                                               IncludeDirective Directive,
+                                               std::optional<bool> IsAngled)
+    : Directive(Directive) {
+  if (RawOrSpelledHeader.starts_with("<")) {
+    Header = RawOrSpelledHeader.trim("<>").str();
+    this->IsAngled = IsAngled.value_or(true);
+  } else if (RawOrSpelledHeader.starts_with("\"")) {
+    Header = RawOrSpelledHeader.trim("\"").str();
+    this->IsAngled = IsAngled.value_or(false);
+  } else {
+    Header = RawOrSpelledHeader.str();
+    this->IsAngled = IsAngled.value_or(false);
+  }
+}
+
+tooling::Replacements
+HeaderIncludes::insert(llvm::ArrayRef<HeaderToInsert> Headers) const {
+  tooling::Replacements Result;
+  if (Headers.empty())
+    return Result;
+
+  std::vector<HeaderToInsert> SortedHeaders = Headers.vec();
----------------
HazardyKnusperkeks wrote:

When there was an error, please add a test case which showcases the error.

https://github.com/llvm/llvm-project/pull/212852


More information about the cfe-commits mailing list