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
7 changes: 6 additions & 1 deletion markup_fmt/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2937,7 +2937,7 @@ pub fn parse_as_interpolated(
let mut dynamics = Vec::new();
let mut chars = text.char_indices().peekable();
let mut pos = 0;
let mut brace_stack = 0u8;
let mut brace_stack = 0usize;
while let Some((i, c)) = chars.next() {
match c {
'{' => {
Expand All @@ -2962,6 +2962,11 @@ pub fn parse_as_interpolated(
}
}
'}' => {
// `pos` only marks an interpolation start while the stack isn't empty,
// so a `}` without a matching `{` is just static text.
if brace_stack == 0 {
continue;
}
if brace_stack > 1 {
brace_stack -= 1;
continue;
Expand Down
1 change: 1 addition & 0 deletions markup_fmt/tests/fmt/jinja/invalid/many-open-braces.jinja
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<style>{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{</style>
6 changes: 6 additions & 0 deletions markup_fmt/tests/fmt/jinja/invalid/many-open-braces.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
source: markup_fmt/tests/fmt.rs
---
<style>
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
</style>
7 changes: 7 additions & 0 deletions markup_fmt/tests/fmt/jinja/invalid/unbalanced-braces.jinja
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<style>}}</style>

<style>a { color: red }}</style>

<div style="}}"></div>

<div style="color: red}}"></div>
14 changes: 14 additions & 0 deletions markup_fmt/tests/fmt/jinja/invalid/unbalanced-braces.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
source: markup_fmt/tests/fmt.rs
---
<style>
}}
</style>

<style>
a { color: red }}
</style>

<div style="}}"></div>

<div style="color: red}}"></div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
source: markup_fmt/tests/fmt.rs
---
<div style="}"></div>

<div style="color: red}"></div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div style="}"></div>

<div style="color: red}"></div>