fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 14:18:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix defaulted Item parameters dropping their type alias and rejecting hex string color defaults (#4525)

Browse Source
This commit is contained in:
Keavon Chambers
2026-09-12 19:32:51 -07:00
committed by GitHub
parent 89b797f4c1
commit 98550f6f25
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
node-graph/node-macro/src/codegen.rs
View File

@@ -228,8 +228,9 @@ pub(crate) fn generate_node_code(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
quote!(Some(concrete!(#implementation_ty)))
}
}
// A concrete ranked `Item<T>` param's scalar `#[default]` parses as a bare `T` literal (unranked, promoted at resolution);
// without one it keeps the structural `Type::Item` wire type with the element's alias on its descriptor (so the rank-0 Properties widget still dispatches, e.g. `Progression`), and `node_inputs` peels to `T` if no `Item` type default exists
// A concrete ranked `Item<T>` param's scalar `#[default]` parses as a bare `T` literal (unranked, promoted at resolution); without one it keeps
// the structural `Type::Item` wire type, and `node_inputs` peels to `T` if no `Item` type default exists. Either way the element's alias stays
// on its descriptor so the rank-0 Properties widget still dispatches, e.g. `Progression`.
None => match &field.ty {
ParsedFieldType::Item {
field: RegularParsedField { value_source, .. },
@@ -241,7 +242,7 @@ pub(crate) fn generate_node_code(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
// The fn's lifetimes are elided since the metadata registration fn declares none of them
let element = substitute_lifetimes(element.clone(), "_");
match value_source {
ParsedValueSource::Default(_) => quote!(Some(concrete!(#element))),
ParsedValueSource::Default(_) => quote!(Some(concrete!(#element, #element))),
_ => quote!(Some(#core_types::item!(#element, #element))),
}
}