diff --git a/Userland/Libraries/LibJS/Print.cpp b/Userland/Libraries/LibJS/Print.cpp index e5d9f03bd9..c8a50aa778 100644 --- a/Userland/Libraries/LibJS/Print.cpp +++ b/Userland/Libraries/LibJS/Print.cpp @@ -7,7 +7,6 @@ */ #include -#include #include #include #include @@ -117,10 +116,10 @@ ErrorOr print_value(JS::PrintContext& print_context, JS::ThrowCompletionOr return print_value(print_context, value_or_error.release_value(), seen_objects); } -DeprecatedString strip_ansi(StringView format_string) +ErrorOr strip_ansi(StringView format_string) { if (format_string.is_empty()) - return DeprecatedString::empty(); + return String(); StringBuilder builder; size_t i; @@ -129,21 +128,23 @@ DeprecatedString strip_ansi(StringView format_string) while (i < format_string.length() && format_string[i] != 'm') ++i; } else { - builder.append(format_string[i]); + TRY(builder.try_append(format_string[i])); } } if (i < format_string.length()) - builder.append(format_string[i]); - return builder.to_deprecated_string(); + TRY(builder.try_append(format_string[i])); + return builder.to_string(); } template ErrorOr js_out(JS::PrintContext& print_context, CheckedFormatString format_string, Args const&... args) { - if (print_context.strip_ansi) - TRY(print_context.stream.format(strip_ansi(format_string.view()), args...)); - else + if (print_context.strip_ansi) { + auto format_string_without_ansi = TRY(strip_ansi(format_string.view())); + TRY(print_context.stream.format(format_string_without_ansi, args...)); + } else { TRY(print_context.stream.format(format_string.view(), args...)); + } return {}; }