Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions markup_fmt/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1396,6 +1396,7 @@ impl<'s> Parser<'s> {
body.push(JinjaTagOrChildren::Children(children));
}
}
let next_tag_start = self.peek_pos();
if let Ok(next_tag) = self.parse_jinja_tag() {
let next_tag_name = parse_jinja_tag_name(&next_tag);
if next_tag_name
Expand All @@ -1409,20 +1410,17 @@ impl<'s> Parser<'s> {
&& matches!(next_tag_name, "elif" | "elseif" | "else")
{
body.push(JinjaTagOrChildren::Tag(next_tag));
} else if let Some(JinjaTagOrChildren::Children(nodes)) = body.last_mut() {
nodes.push(
self.with_taken(|parser| {
parser.parse_jinja_tag_or_block(Some(next_tag), children_parser)
})
.map(|(kind, raw)| T::build(kind, raw))?,
);
} else {
body.push(JinjaTagOrChildren::Children(vec![
self.with_taken(|parser| {
parser.parse_jinja_tag_or_block(Some(next_tag), children_parser)
})
.map(|(kind, raw)| T::build(kind, raw))?,
]));
let kind =
self.parse_jinja_tag_or_block(Some(next_tag), children_parser)?;
let node = T::build(kind, unsafe {
self.source.get_unchecked(next_tag_start..self.peek_pos())
});
if let Some(JinjaTagOrChildren::Children(nodes)) = body.last_mut() {
nodes.push(node);
} else {
body.push(JinjaTagOrChildren::Children(vec![node]));
}
}
} else {
break;
Expand Down
6 changes: 6 additions & 0 deletions markup_fmt/tests/fmt/jinja/control-structure/fixture.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,9 @@ There are {{ count }} {{ name }} objects.
<dt>Realname</dt>
</dl>
{% endcall %}

{% if outer %}
{% raw %}
<p class="untouched" >keep</p>
{% endraw %}
{% endif %}
6 changes: 6 additions & 0 deletions markup_fmt/tests/fmt/jinja/control-structure/fixture.snap
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,9 @@ source: markup_fmt/tests/fmt.rs
<dt>Realname</dt>
</dl>
{% endcall %}

{% if outer %}
{% raw %}
<p class="untouched" >keep</p>
{% endraw %}
{% endif %}
6 changes: 6 additions & 0 deletions markup_fmt/tests/fmt/jinja/ignore/nested-block.jinja
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% if outer %}
<!-- markup-fmt-ignore -->
{% if inner %}
<p class="unformatted" >keep</p>
{% endif %}
{% endif %}
9 changes: 9 additions & 0 deletions markup_fmt/tests/fmt/jinja/ignore/nested-block.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: markup_fmt/tests/fmt.rs
---
{% if outer %}
<!-- markup-fmt-ignore -->
{% if inner %}
<p class="unformatted" >keep</p>
{% endif %}
Comment thread
UnknownPlatypus marked this conversation as resolved.
{% endif %}