diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp index 2f0051dc2a..d898079e43 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp @@ -1,6 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling - * Copyright (c) 2022, Sam Atkins + * Copyright (c) 2022-2023, Sam Atkins * * SPDX-License-Identifier: BSD-2-Clause */ @@ -43,7 +43,7 @@ ErrorOr generate_header_file(JsonArray& identifier_data, Core::File& file) { StringBuilder builder; SourceGenerator generator { builder }; - generator.append(R"~~~( + TRY(generator.try_append(R"~~~( #pragma once #include @@ -53,19 +53,19 @@ namespace Web::CSS { enum class ValueID { Invalid, -)~~~"); +)~~~")); TRY(identifier_data.try_for_each([&](auto& name) -> ErrorOr { auto member_generator = TRY(generator.fork()); TRY(member_generator.set("name:titlecase", TRY(title_casify(name.to_deprecated_string())))); - member_generator.append(R"~~~( + TRY(member_generator.try_append(R"~~~( @name:titlecase@, -)~~~"); +)~~~")); return {}; })); - generator.append(R"~~~( + TRY(generator.try_append(R"~~~( }; Optional value_id_from_string(StringView); @@ -73,7 +73,7 @@ StringView string_from_value_id(ValueID); } -)~~~"); +)~~~")); TRY(file.write_until_depleted(generator.as_string_view().bytes())); return {}; @@ -84,7 +84,7 @@ ErrorOr generate_implementation_file(JsonArray& identifier_data, Core::Fil StringBuilder builder; SourceGenerator generator { builder }; - generator.append(R"~~~( + TRY(generator.try_append(R"~~~( #include #include #include @@ -92,19 +92,19 @@ ErrorOr generate_implementation_file(JsonArray& identifier_data, Core::Fil namespace Web::CSS { HashMap g_stringview_to_value_id_map { -)~~~"); +)~~~")); TRY(identifier_data.try_for_each([&](auto& name) -> ErrorOr { auto member_generator = TRY(generator.fork()); - member_generator.set("name", name.to_deprecated_string()); + TRY(member_generator.set("name", TRY(String::from_deprecated_string(name.to_deprecated_string())))); TRY(member_generator.set("name:titlecase", TRY(title_casify(name.to_deprecated_string())))); - member_generator.append(R"~~~( + TRY(member_generator.try_append(R"~~~( {"@name@"sv, ValueID::@name:titlecase@}, -)~~~"); +)~~~")); return {}; })); - generator.append(R"~~~( + TRY(generator.try_append(R"~~~( }; Optional value_id_from_string(StringView string) @@ -114,27 +114,27 @@ Optional value_id_from_string(StringView string) StringView string_from_value_id(ValueID value_id) { switch (value_id) { -)~~~"); +)~~~")); TRY(identifier_data.try_for_each([&](auto& name) -> ErrorOr { auto member_generator = TRY(generator.fork()); - member_generator.set("name", name.to_deprecated_string()); + TRY(member_generator.set("name", TRY(String::from_deprecated_string(name.to_deprecated_string())))); TRY(member_generator.set("name:titlecase", TRY(title_casify(name.to_deprecated_string())))); - member_generator.append(R"~~~( + TRY(member_generator.try_append(R"~~~( case ValueID::@name:titlecase@: return "@name@"sv; - )~~~"); + )~~~")); return {}; })); - generator.append(R"~~~( + TRY(generator.try_append(R"~~~( default: return "(invalid CSS::ValueID)"sv; } } } // namespace Web::CSS -)~~~"); +)~~~")); TRY(file.write_until_depleted(generator.as_string_view().bytes())); return {};