Skip to content

Commit c48b1ff

Browse files
committed
Ensure the message field is also angled
1 parent 8c3b2ea commit c48b1ff

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

clang-tools-extra/clangd/IncludeCleaner.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,11 @@ std::vector<Diag> generateMissingIncludeDiagnostics(
159159
if (!Replacement.has_value())
160160
continue;
161161

162+
if (Angled && Spelling.front() == '\"') {
163+
Spelling.front() = '<';
164+
Spelling.back() = '>';
165+
}
166+
162167
Diag &D = Result.emplace_back();
163168
D.Message =
164169
llvm::formatv("No header providing \"{0}\" is directly included",

clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,12 @@ TEST(IncludeCleaner, GenerateMissingHeaderDiags) {
315315
withFix({Fix(MainFile.range("insert_b"), "#include \"b.h\"\n",
316316
"#include \"b.h\""),
317317
FixMessage("add all missing includes")})),
318-
AllOf(Diag(MainFile.range("b_angled"),
319-
"No header providing \"b_angled\" is directly included"),
320-
withFix(
321-
{Fix(MainFile.range("insert_b_angled"),
322-
"#include <b_angled.h>\n", "#include \"b_angled.h\""),
323-
FixMessage("add all missing includes")})),
318+
AllOf(
319+
Diag(MainFile.range("b_angled"),
320+
"No header providing \"b_angled\" is directly included"),
321+
withFix({Fix(MainFile.range("insert_b_angled"),
322+
"#include <b_angled.h>\n", "#include <b_angled.h>"),
323+
FixMessage("add all missing includes")})),
324324
AllOf(Diag(MainFile.range("bar"),
325325
"No header providing \"ns::Bar\" is directly included"),
326326
withFix({Fix(MainFile.range("insert_d"),

0 commit comments

Comments
 (0)