mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

templater: reuse parse_commit_term() to coerce if() condition to bool

Browse source 
This should fix some inconsistent parsing of condition term.
This commit is contained in:
Yuya Nishihara 2023-01-29 12:15:17 +09:00
parent 553bee6ac4
commit 259314b442
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/template_parser.rs
View file

@ -135,6 +135,13 @@ enum Expression<'a, C> {
} }
impl<'a, C: 'a> Expression<'a, C> { impl<'a, C: 'a> Expression<'a, C> {
fn try_into_boolean(self) -> Option<Box<dyn TemplateProperty<C, Output = bool> + 'a>> {
match self {
Expression::Property(PropertyAndLabels(property, _)) => property.try_into_boolean(),
Expression::Template(_) => None,
}
}
fn into_template(self) -> Box<dyn Template<C> + 'a> { fn into_template(self) -> Box<dyn Template<C> + 'a> {
match self { match self {
Expression::Property(property_labels) => property_labels.into_template(), Expression::Property(property_labels) => property_labels.into_template(),
@ -273,24 +280,6 @@ fn parse_commit_keyword<'a>(
PropertyAndLabels(property, vec![pair.as_str().to_string()]) PropertyAndLabels(property, vec![pair.as_str().to_string()])
} }
fn parse_boolean_commit_property<'a>(
repo: RepoRef<'a>,
workspace_id: &WorkspaceId,
pair: Pair<Rule>,
) -> Box<dyn TemplateProperty<Commit, Output = bool> + 'a> {
let mut inner = pair.into_inner();
let pair = inner.next().unwrap();
let _method = inner.next().unwrap();
assert!(inner.next().is_none());
match pair.as_rule() {
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:?}"),
}
}
fn parse_commit_term<'a>( fn parse_commit_term<'a>(
repo: RepoRef<'a>, repo: RepoRef<'a>,
workspace_id: &WorkspaceId, workspace_id: &WorkspaceId,
@ -349,9 +338,12 @@ fn parse_commit_term<'a>(
} }
"if" => { "if" => {
let condition_pair = args.next().unwrap(); let condition_pair = args.next().unwrap();
let condition_template = condition_pair.into_inner().next().unwrap();
let condition = let condition =
parse_boolean_commit_property(repo, workspace_id, condition_template); parse_commit_template_rule(repo, workspace_id, condition_pair.clone())
.try_into_boolean()
.unwrap_or_else(|| {
panic!("cannot yet use this as boolean: {condition_pair:?}")
});
let true_template = match args.next() { let true_template = match args.next() {
None => panic!("if() requires at least two arguments"), None => panic!("if() requires at least two arguments"),

3
tests/test_templater.rs
View file

@ -100,6 +100,9 @@ fn test_templater_parsed_tree() {
// Parenthesized multiple terms and concatenation // Parenthesized multiple terms and concatenation
insta::assert_snapshot!(render(r#"(commit_id.short() " ") empty"#), @"000000000000 true"); insta::assert_snapshot!(render(r#"(commit_id.short() " ") empty"#), @"000000000000 true");
// Parenthesized "if" condition
insta::assert_snapshot!(render(r#"if((divergent), "t", "f")"#), @"f");
} }
fn get_template_output( fn get_template_output(