refactor

markup_fmt/src/parser.rs

@@ -354,25 +354,32 @@ impl<'s> Parser<'s> {
             }
 
             let start = match self.chars.peek() {
-                Some((i, c)) if is_unquoted_attr_value_char(*c) => { *i },
-                _ => return Err(self.emit_error(SyntaxErrorKind::ExpectAttrValue))
+                Some((i, c)) if is_unquoted_attr_value_char(*c) => *i,
+                _ => return Err(self.emit_error(SyntaxErrorKind::ExpectAttrValue)),
             };
 
             let mut end = start;
             loop {
                 match self.chars.peek() {
-                    Some((_, '{')) => {
-                        self.parse_mustache_interpolation()?;
-                        match self.chars.peek() {
-                            Some((i, _)) => end = i - 1,
-                            None => break
+                    Some((i, '{'))
+                        if matches!(self.language, Language::Jinja | Language::Vento) =>
+                    {
+                        end = *i;
+                        let mut chars = self.chars.clone();
+                        chars.next();
+                        if chars.next_if(|(_, c)| *c == '{').is_some() {
+                            // We use inclusive range when returning string,
+                            // so we need to substract 1 here.
+                            end += self.parse_mustache_interpolation()?.len() + "{{}}".len() - 1;
+                        } else {
+                            self.chars.next();
                         }
                     }
                     Some((i, c)) if is_unquoted_attr_value_char(*c) => {
                         end = *i;
                         self.chars.next();
-                    },
-                    _ => break
+                    }
+                    _ => break,
                 };
             }