mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-28 17:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

templater: add helper to create Expression with/without labels

Browse source 
These functions aren't suffixed with _property, since Expression::Template()
will be flattened into P::Template().
This commit is contained in:
Yuya Nishihara 2023-03-07 13:10:08 +09:00
parent e5a4c2e75b
commit 0f87649696
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/template_parser.rs
View file

@ -725,6 +725,16 @@ pub enum Expression<'a, C, P> {
Template(Box<dyn Template<C> + 'a>),
}
impl<'a, C: 'a, P> Expression<'a, C, P> {
fn unlabeled(property: P) -> Self {
Expression::Property(property, vec![])
}
fn with_label(property: P, label: impl Into<String>) -> Self {
Expression::Property(property, vec![label.into()])
}
}
impl<'a, C: 'a, P: IntoTemplateProperty<'a, C>> Expression<'a, C, P> {
pub fn try_into_boolean(self) -> Option<Box<dyn TemplateProperty<C, Output = bool> + 'a>> {
match self {
@ -1089,16 +1099,15 @@ pub fn build_expression<'a, L: TemplateLanguage<'a>>(
match &node.kind {
ExpressionKind::Identifier(name) => {
let property = language.build_keyword(name, node.span)?;
let labels = vec![(*name).to_owned()];
Ok(Expression::Property(property, labels))
Ok(Expression::with_label(property, *name))
}
ExpressionKind::Integer(value) => {
let property = language.wrap_integer(Literal(*value));
Ok(Expression::Property(property, vec![]))
Ok(Expression::unlabeled(property))
}
ExpressionKind::String(value) => {
let property = language.wrap_string(Literal(value.clone()));
Ok(Expression::Property(property, vec![]))
Ok(Expression::unlabeled(property))
}
ExpressionKind::List(nodes) => {
let templates = nodes