mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 15:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

templater: generalize formattable list template for map operation

Browse source
This commit is contained in:
Yuya Nishihara 2023-03-14 19:17:50 +09:00
parent ea0cc374aa
commit 369c119053
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/template_builder.rs
View file

@ -20,9 +20,9 @@ use crate::template_parser::{
TemplateParseResult,
};
use crate::templater::{
ConcatTemplate, ConditionalTemplate, FormattablePropertyListTemplate, IntoTemplate,
LabelTemplate, Literal, PlainTextFormattedProperty, ReformatTemplate, SeparateTemplate,
Template, TemplateFunction, TemplateProperty, TimestampRange,
ConcatTemplate, ConditionalTemplate, IntoTemplate, LabelTemplate, ListPropertyTemplate,
Literal, PlainTextFormattedProperty, ReformatTemplate, SeparateTemplate, Template,
TemplateFunction, TemplateProperty, TimestampRange,
};
use crate::{text_util, time_util};
@ -444,7 +444,10 @@ pub fn build_list_method<'a, L: TemplateLanguage<'a>, P: Template<()> + 'a>(
"join" => {
let [separator_node] = template_parser::expect_exact_arguments(function)?;
let separator = build_expression(language, separator_node)?.into_template();
let template = FormattablePropertyListTemplate::new(self_property, separator);
let template =
ListPropertyTemplate::new(self_property, separator, |_, formatter, item| {
item.format(&(), formatter)
});
language.wrap_template(template)
}
// TODO: .map()

28
src/templater.rs
View file

@ -366,36 +366,38 @@ impl<C, T: Template<C>> TemplateProperty<C> for PlainTextFormattedProperty<T> {
}
}
/// Renders a list of template properties with the given separator.
/// Renders template property of list type with the given separator.
///
/// Each template property can be extracted as a context-less value, but
/// the separator takes a context of type `C`.
pub struct FormattablePropertyListTemplate<P, S> {
/// Each list item will be formatted by the given `format_item()` function.
/// The separator takes a context of type `C`.
pub struct ListPropertyTemplate<P, S, F> {
property: P,
separator: S,
format_item: F,
}
impl<P, S> FormattablePropertyListTemplate<P, S> {
pub fn new<C>(property: P, separator: S) -> Self
impl<P, S, F> ListPropertyTemplate<P, S, F> {
pub fn new<C, O>(property: P, separator: S, format_item: F) -> Self
where
P: TemplateProperty<C>,
P::Output: IntoIterator,
<P::Output as IntoIterator>::Item: Template<()>,
P::Output: IntoIterator<Item = O>,
S: Template<C>,
F: Fn(&C, &mut dyn Formatter, O) -> io::Result<()>,
{
FormattablePropertyListTemplate {
ListPropertyTemplate {
property,
separator,
format_item,
}
}
}
impl<C, P, S> Template<C> for FormattablePropertyListTemplate<P, S>
impl<C, O, P, S, F> Template<C> for ListPropertyTemplate<P, S, F>
where
P: TemplateProperty<C>,
P::Output: IntoIterator,
<P::Output as IntoIterator>::Item: Template<()>,
P::Output: IntoIterator<Item = O>,
S: Template<C>,
F: Fn(&C, &mut dyn Formatter, O) -> io::Result<()>,
{
fn format(&self, context: &C, formatter: &mut dyn Formatter) -> io::Result<()> {
let contents = self.property.extract(context);
@ -404,7 +406,7 @@ where
formatter,
contents,
&self.separator,
|_, formatter, item| item.format(&(), formatter),
&self.format_item,
)
}
}