RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:47:35 +00:00
Code Issues Activity Actions

LibJS: Escape printed strings making them proper string literals

Browse source 
Previously we just printed '"' string-contents '"', which was not a
proper string literal.
This commit is contained in:
Ali Mohammad Pur 2023-02-15 17:53:54 +03:30 • committed by Linus Groh
parent e8249d735d
commit a8bcb901c0
1 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,38 @@
namespace { namespace {
static ErrorOr<String> escape_for_string_literal(StringView string)
{
StringBuilder builder;
for (auto byte : string.bytes()) {
switch (byte) {
case '\r':
TRY(builder.try_append("\\r"sv));
continue;
case '\v':
TRY(builder.try_append("\\v"sv));
continue;
case '\f':
TRY(builder.try_append("\\f"sv));
continue;
case '\b':
TRY(builder.try_append("\\b"sv));
continue;
case '\n':
TRY(builder.try_append("\\n"sv));
continue;
case '\\':
TRY(builder.try_append("\\\\"sv));
continue;
default:
TRY(builder.try_append(byte));
continue;
}
}
return builder.to_string();
}
ErrorOr<void> print_value(JS::PrintContext&, JS::Value value, HashTable<JS::Object*>& seen_objects); ErrorOr<void> print_value(JS::PrintContext&, JS::Value value, HashTable<JS::Object*>& seen_objects);
template<typename T> template<typename T>
@ -1014,11 +1046,18 @@ ErrorOr<void> print_value(JS::PrintContext& print_context, JS::Value value, Hash
TRY(js_out(print_context, "\033[33;1m")); TRY(js_out(print_context, "\033[33;1m"));
else if (value.is_undefined()) else if (value.is_undefined())
TRY(js_out(print_context, "\033[34;1m")); TRY(js_out(print_context, "\033[34;1m"));
if (value.is_string()) if (value.is_string())
TRY(js_out(print_context, "\"")); TRY(js_out(print_context, "\""));
else if (value.is_negative_zero()) else if (value.is_negative_zero())
TRY(js_out(print_context, "-")); TRY(js_out(print_context, "-"));
TRY(js_out(print_context, "{}", TRY(value.to_string_without_side_effects())));
auto contents = TRY(value.to_string_without_side_effects());
if (value.is_string())
TRY(js_out(print_context, "{}", TRY(escape_for_string_literal(contents))));
else
TRY(js_out(print_context, "{}", contents));
if (value.is_string()) if (value.is_string())
TRY(js_out(print_context, "\"")); TRY(js_out(print_context, "\""));
TRY(js_out(print_context, "\033[0m")); TRY(js_out(print_context, "\033[0m"));