RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:37:34 +00:00
Code Issues Activity Actions

LibJS: Replace DeprecatedString with String in strip_ansi

Browse source
This commit is contained in:
Peter Brottveit Bock 2023-04-22 22:48:17 +02:00 • committed by Andreas Kling
parent fac7045a44
commit b6deb8fd42
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibJS/Print.cpp
View file

@ -7,7 +7,6 @@
*/ */
#include <AK/Concepts.h> #include <AK/Concepts.h>
#include <AK/DeprecatedString.h>
#include <AK/Stream.h> #include <AK/Stream.h>
#include <LibJS/Print.h> #include <LibJS/Print.h>
#include <LibJS/Runtime/Array.h> #include <LibJS/Runtime/Array.h>
@ -117,10 +116,10 @@ ErrorOr<void> print_value(JS::PrintContext& print_context, JS::ThrowCompletionOr
return print_value(print_context, value_or_error.release_value(), seen_objects); return print_value(print_context, value_or_error.release_value(), seen_objects);
} }
DeprecatedString strip_ansi(StringView format_string) ErrorOr<String> strip_ansi(StringView format_string)
{ {
if (format_string.is_empty()) if (format_string.is_empty())
return DeprecatedString::empty(); return String();
StringBuilder builder; StringBuilder builder;
size_t i; size_t i;
@ -129,21 +128,23 @@ DeprecatedString strip_ansi(StringView format_string)
while (i < format_string.length() && format_string[i] != 'm') while (i < format_string.length() && format_string[i] != 'm')
++i; ++i;
} else { } else {
builder.append(format_string[i]); TRY(builder.try_append(format_string[i]));
} }
} }
if (i < format_string.length()) if (i < format_string.length())
builder.append(format_string[i]); TRY(builder.try_append(format_string[i]));
return builder.to_deprecated_string(); return builder.to_string();
} }
template<typename... Args> template<typename... Args>
ErrorOr<void> js_out(JS::PrintContext& print_context, CheckedFormatString<Args...> format_string, Args const&... args) ErrorOr<void> js_out(JS::PrintContext& print_context, CheckedFormatString<Args...> format_string, Args const&... args)
{ {
if (print_context.strip_ansi) if (print_context.strip_ansi) {
TRY(print_context.stream.format(strip_ansi(format_string.view()), args...)); auto format_string_without_ansi = TRY(strip_ansi(format_string.view()));
else TRY(print_context.stream.format(format_string_without_ansi, args...));
} else {
TRY(print_context.stream.format(format_string.view(), args...)); TRY(print_context.stream.format(format_string.view(), args...));
}
return {}; return {};
} }