================
@@ -4219,19 +4220,17 @@ fixCppIncludeInsertions(StringRef Code, const
tooling::Replacements &Replaces,
"'#include ...'");
(void)Matched;
auto IncludeName = Matches[2];
- auto Replace =
- Includes.insert(IncludeName.trim("\"<>"), IncludeName.starts_with("<"),
- tooling::IncludeDirective::Include);
- if (Replace) {
- auto Err = Result.add(*Replace);
- if (Err) {
- consumeError(std::move(Err));
- unsigned NewOffset =
- Result.getShiftedCodePosition(Replace->getOffset());
- auto Shifted = tooling::Replacement(FileName, NewOffset, 0,
- Replace->getReplacementText());
- Result = Result.merge(tooling::Replacements(Shifted));
- }
+ HeadersToInsert.emplace_back(IncludeName,
+ tooling::IncludeDirective::Include);
+ }
+ for (const auto &Replace : Includes.insert(HeadersToInsert)) {
+ auto Err = Result.add(Replace);
+ if (Err) {
----------------
kadircet wrote:
nit: prefer early exit:
```
if (!Err)
continue;
...
```
https://github.com/llvm/llvm-project/pull/212852
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
