Skip to content

[lldb] Fix a positioning bug in diagnostics output #116711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2024
Merged

[lldb] Fix a positioning bug in diagnostics output #116711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lldb/source/Utility/DiagnosticsRendering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ void RenderDiagnosticDetails(Stream &stream,
continue;

stream << std::string(loc.column - x_pos, ' ') << cursor;
++x_pos;
x_pos = loc.column + 1;
for (unsigned i = 0; i + 1 < loc.length; ++i) {
stream << underline;
++x_pos;
x_pos += 1;
}
}
}
Expand Down
20 changes: 19 additions & 1 deletion lldb/unittests/Utility/DiagnosticsRenderingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,27 @@ TEST_F(ErrorDisplayTest, RenderStatus) {
auto line2 = lines.first;
lines = lines.second.split('\n');
auto line3 = lines.first;
// 1234567
// 1234567
ASSERT_EQ(line1, "^~~ ^~~");
ASSERT_EQ(line2, "| error: Y");
ASSERT_EQ(line3, "error: X");
}
{
// Test diagnostics on the same line are emitted correctly.
SourceLocation loc1 = {FileSpec{"a.c"}, 1, 2, 0, false, true};
SourceLocation loc2 = {FileSpec{"a.c"}, 1, 6, 0, false, true};
std::string result =
Render({DiagnosticDetail{loc1, eSeverityError, "X", "X"},
DiagnosticDetail{loc2, eSeverityError, "Y", "Y"}});
auto lines = StringRef(result).split('\n');
auto line1 = lines.first;
lines = lines.second.split('\n');
auto line2 = lines.first;
lines = lines.second.split('\n');
auto line3 = lines.first;
// 1234567
ASSERT_EQ(line1, " ^ ^");
ASSERT_EQ(line2, " | error: Y");
ASSERT_EQ(line3, " error: X");
}
}
Loading