1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 18:38:10 +00:00

Everywhere: Fix incorrect uses of String::format and StringBuilder::appendf

These changes are arbitrarily divided into multiple commits to make it
easier to find potentially introduced bugs with git bisect.
This commit is contained in:
Sahan Fernando 2021-01-12 01:01:33 +11:00 committed by Andreas Kling
parent 6d97b623cd
commit fe2b8906d4
7 changed files with 21 additions and 21 deletions

View file

@ -32,7 +32,6 @@ namespace Markdown {
String Table::render_for_terminal(size_t view_width) const
{
auto unit_width_length = view_width == 0 ? 4 : ((float)(view_width - m_columns.size()) / (float)m_total_width);
StringBuilder format_builder;
StringBuilder builder;
auto write_aligned = [&](const auto& text, auto width, auto alignment) {
@ -40,17 +39,13 @@ String Table::render_for_terminal(size_t view_width) const
for (auto& span : text.spans())
original_length += span.text.length();
auto string = text.render_for_terminal();
format_builder.clear();
if (alignment == Alignment::Center) {
auto padding_length = (width - original_length) / 2;
builder.appendf("%*s%s%*s", padding_length, "", string.characters(), padding_length, "");
builder.appendf("%*s%s%*s", (int)padding_length, "", string.characters(), (int)padding_length, "");
if ((width - original_length) % 2)
builder.append(' ');
} else {
format_builder.appendf("%%%s%zus", alignment == Alignment::Left ? "-" : "", width + (string.length() - original_length));
builder.appendf(
format_builder.to_string().characters(),
string.characters());
builder.appendf(alignment == Alignment::Left ? "%-*s" : "%*s", (int)(width + (string.length() - original_length)), string.characters());
}
};