ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

templater: extract method that coerces property to boolean

Browse source
This commit is contained in:
Yuya Nishihara 2023-01-30 19:52:41 +09:00
parent 5eee7186ba
commit 553bee6ac4
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/template_parser.rs
View file

@ -89,6 +89,16 @@ impl<'a, I: 'a> Property<'a, I> {
}
}
fn try_into_boolean(self) -> Option<Box<dyn TemplateProperty<I, Output = bool> + 'a>> {
match self {
Property::String(property) => {
Some(Box::new(TemplateFunction::new(property, |s| !s.is_empty())))
}
Property::Boolean(property) => Some(property),
_ => None,
}
}
fn into_template(self) -> Box<dyn Template<I> + 'a> {
fn wrap<'a, I: 'a, O: Template<()> + 'a>(
property: Box<dyn TemplateProperty<I, Output = O> + 'a>,
@ -273,13 +283,10 @@ fn parse_boolean_commit_property<'a>(
let _method = inner.next().unwrap();
assert!(inner.next().is_none());
match pair.as_rule() {
Rule::identifier => match parse_commit_keyword(repo, workspace_id, pair.clone()).0 {
Property::Boolean(property) => property,
Property::String(property) => {
Box::new(TemplateFunction::new(property, |string| !string.is_empty()))
}
_ => panic!("cannot yet use this as boolean: {pair:?}"),
},
Rule::identifier => parse_commit_keyword(repo, workspace_id, pair.clone())
.0
.try_into_boolean()
.unwrap_or_else(|| panic!("cannot yet use this as boolean: {pair:?}")),
_ => panic!("cannot yet use this as boolean: {pair:?}"),
}
}