mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-08 21:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

templater: extract low-level helper to format list items with separator

Browse source 
For map operation, we'll have to bind parameter and evaluate template for
each element, which can't be purely abstracted as a Template<()> type.
This commit is contained in:
Yuya Nishihara 2023-03-14 19:02:42 +09:00
parent 1c0bde1a2b
commit ea0cc374aa
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/templater.rs
View file

@ -399,8 +399,13 @@ where
{
fn format(&self, context: &C, formatter: &mut dyn Formatter) -> io::Result<()> {
let contents = self.property.extract(context);
let contents_iter = contents.into_iter().map(Literal); // as Template<C>
format_joined(context, formatter, contents_iter, &self.separator)
format_joined_with(
context,
formatter,
contents,
&self.separator,
|_, formatter, item| item.format(&(), formatter),
)
}
}
@ -480,14 +485,35 @@ where
I: IntoIterator,
I::Item: Template<C>,
S: Template<C>,
{
format_joined_with(
context,
formatter,
contents,
separator,
|context, formatter, item| item.format(context, formatter),
)
}
fn format_joined_with<C, I, S, F>(
context: &C,
formatter: &mut dyn Formatter,
contents: I,
separator: S,
mut format_item: F,
) -> io::Result<()>
where
I: IntoIterator,
S: Template<C>,
F: FnMut(&C, &mut dyn Formatter, I::Item) -> io::Result<()>,
{
let mut contents_iter = contents.into_iter().fuse();
if let Some(content) = contents_iter.next() {
content.format(context, formatter)?;
if let Some(item) = contents_iter.next() {
format_item(context, formatter, item)?;
}
for content in contents_iter {
for item in contents_iter {
separator.format(context, formatter)?;
content.format(context, formatter)?;
format_item(context, formatter, item)?;
}
Ok(())
}