quickshell/quickshell-docs
2
1
Fork 0
Code Issues Activity

typegen: fix list return types

Browse source
This commit is contained in:
outfoxxed 2024-06-05 19:25:35 -07:00
parent 2fe17f862f
commit 4cc4155df4
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
1 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
typegen/src/resolver.rs
View file

@ -56,7 +56,23 @@ pub fn resolve_types(
} }
}; };
fn qmlparamtype(mut ctype: &str, typespec: &TypeSpec) -> outform::Type { fn qmlparamtype(ctype: &str, typespec: &TypeSpec) -> outform::Type {
let (mut ctype, of) = match ctype.split_once('<') {
None => (ctype, None),
Some((ctype, mut remaining)) => {
if remaining.ends_with('*') {
remaining = &remaining[0..remaining.len() - 1];
}
// closing `>`
remaining = &remaining[0..remaining.len() - 1];
let of = Box::new(qmlparamtype(remaining, typespec));
(ctype, Some(of))
},
};
if ctype.ends_with('*') { if ctype.ends_with('*') {
ctype = &ctype[0..ctype.len() - 1]; ctype = &ctype[0..ctype.len() - 1];
} }
@ -76,7 +92,9 @@ pub fn resolve_types(
match qtype { match qtype {
Some((module, name)) => { Some((module, name)) => {
outform::Type::resolve(module.as_ref().map(|v| v as &str), &name) let mut t = outform::Type::resolve(module.as_ref().map(|v| v as &str), &name);
t.of = of;
t
}, },
None => outform::Type::unknown(), None => outform::Type::unknown(),
} }
@ -115,32 +133,10 @@ pub fn resolve_types(
details: prop.details.clone(), details: prop.details.clone(),
flags, flags,
}, },
None => { None => outform::Property {
let (ctype, of) = match ctype.split_once('<') { type_: PropertyType::Type(qmlparamtype(ctype, typespec)),
None => (ctype, None), details: prop.details.clone(),
Some((ctype, mut remaining)) => { flags,
if remaining.ends_with('*') {
remaining = &remaining[0..remaining.len() - 1];
}
// closing `>`
remaining = &remaining[0..remaining.len() - 1];
(ctype, Some(remaining))
},
};
let mut type_ = qmlparamtype(ctype, typespec);
if let Some(of) = of {
type_.of = Some(Box::new(qmlparamtype(of, typespec)));
}
outform::Property {
type_: PropertyType::Type(type_),
details: prop.details.clone(),
flags,
}
}, },
} }
} }