refactor: simplify parser blocks complexity

g-plane · Nov 13, 2024 · 5cd836c · 5cd836c
1 parent feca4a0
commit 5cd836c
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
@@ -205,30 +205,21 @@ impl<'s> Parser<'s> {
         self.skip_ws();
         let children = self.parse_angular_control_flow_children()?;
 
+        self.skip_ws();
         let mut empty = None;
         let mut chars = self.chars.clone();
-        'peek: loop {
-            match chars.next() {
-                Some((_, c)) if c.is_ascii_whitespace() => continue 'peek,
-                Some((_, '@')) => {
-                    if chars
-                        .next_if(|(_, c)| *c == 'e')
-                        .and_then(|_| chars.next_if(|(_, c)| *c == 'm'))
-                        .and_then(|_| chars.next_if(|(_, c)| *c == 'p'))
-                        .and_then(|_| chars.next_if(|(_, c)| *c == 't'))
-                        .and_then(|_| chars.next_if(|(_, c)| *c == 'y'))
-                        .is_some()
-                    {
-                        self.chars = chars;
-                        self.skip_ws();
-                        empty = Some(self.parse_angular_control_flow_children()?);
-                        break 'peek;
-                    } else {
-                        break 'peek;
-                    }
-                }
-                _ => break 'peek,
-            }
+        if chars
+            .next_if(|(_, c)| *c == '@')
+            .and_then(|_| chars.next_if(|(_, c)| *c == 'e'))
+            .and_then(|_| chars.next_if(|(_, c)| *c == 'm'))
+            .and_then(|_| chars.next_if(|(_, c)| *c == 'p'))
+            .and_then(|_| chars.next_if(|(_, c)| *c == 't'))
+            .and_then(|_| chars.next_if(|(_, c)| *c == 'y'))
+            .is_some()
+        {
+            self.chars = chars;
+            self.skip_ws();
+            empty = Some(self.parse_angular_control_flow_children()?);
         }
 
         Ok(AngularFor {