From c0559e8a10b6f0e0adc6ac37999580edead54d2e Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Tue, 28 Feb 2023 21:32:52 +0100 Subject: [PATCH] LibWeb: Handle optional return values for getters returning new String --- .../LibWeb/BindingsGenerator/IDLGenerators.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp index f10710578d..698cd4ac4a 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp @@ -1487,11 +1487,19 @@ static void generate_wrap_statement(SourceGenerator& generator, DeprecatedString if (type.is_nullable() && !is(type)) { if (type.is_string()) { - scoped_generator.append(R"~~~( + if (!interface.extended_attributes.contains("UseNewAKString")) { + scoped_generator.append(R"~~~( if (@value@.is_null()) { @result_expression@ JS::js_null(); } else { )~~~"); + } else { + scoped_generator.append(R"~~~( + if (!@value@.has_value()) { + @result_expression@ JS::js_null(); + } else { +)~~~"); + } } else if (type.name() == "sequence") { scoped_generator.append(R"~~~( if (!@value@.has_value()) { @@ -1508,9 +1516,15 @@ static void generate_wrap_statement(SourceGenerator& generator, DeprecatedString } if (type.is_string()) { - scoped_generator.append(R"~~~( + if (type.is_nullable() && interface.extended_attributes.contains("UseNewAKString")) { + scoped_generator.append(R"~~~( + @result_expression@ JS::PrimitiveString::create(vm, @value@.release_value()); +)~~~"); + } else { + scoped_generator.append(R"~~~( @result_expression@ JS::PrimitiveString::create(vm, @value@); )~~~"); + } } else if (type.name() == "sequence") { // https://webidl.spec.whatwg.org/#es-sequence auto& sequence_generic_type = verify_cast(type);