From e5470401f4861a6aa57a2a4dfd6ce0402de71e1d Mon Sep 17 00:00:00 2001 From: frozolotl <44589151+frozolotl@users.noreply.github.com> Date: Fri, 24 Nov 2023 05:41:38 -0500 Subject: Fix `has` on non-inherent fields (#2745) --- crates/typst-macros/src/elem.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'crates/typst-macros/src') diff --git a/crates/typst-macros/src/elem.rs b/crates/typst-macros/src/elem.rs index c36becb2..2de0adf2 100644 --- a/crates/typst-macros/src/elem.rs +++ b/crates/typst-macros/src/elem.rs @@ -731,12 +731,18 @@ fn create_native_elem_impl(element: &Elem) -> TokenStream { quote! { <#elem as #model::ElementFields>::Fields::#name => None, } - } else { + } else if field.inherent() { quote! { <#elem as #model::ElementFields>::Fields::#name => Some( ::typst::eval::IntoValue::into_value(self.#field_ident.clone()) ), } + } else { + quote! { + <#elem as #model::ElementFields>::Fields::#name => { + self.#field_ident.clone().map(::typst::eval::IntoValue::into_value) + } + } } }); -- cgit v1.2.3