fix: fix comments parsed as tags in Astro

g-plane · Sep 18, 2024 · 09dfed7 · 09dfed7
1 parent 014e861
commit 09dfed7
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 5 deletions.
diff --git a/dprint_plugin/tests/integration/basic.astro b/dprint_plugin/tests/integration/basic.astro
@@ -53,3 +53,11 @@ item).join()}></div>
 let title =
     'My Site';
 ---
+
+{[].map((value) => {
+	console.log(value);
+
+	return <div></div><h1></h1>
+})}
+
+{/* <svg><rect x="182.56" y="230.58" width="100.48" height="104.25" rx="50.24" ry="50.24"></rect></svg> */}
diff --git a/dprint_plugin/tests/integration/biome/basic.astro.snap b/dprint_plugin/tests/integration/biome/basic.astro.snap
@@ -65,3 +65,15 @@ document.getElementById("button").addEventListener("click", handleClick);
 
 <!-- Below should be treated as text node. -->
 --- let title = 'My Site'; ---
+
+{
+  [].map((value) => {
+  console.log(value);
+
+  return <div></div><h1></h1>;
+  })
+}
+
+{
+  /* <svg><rect x="182.56" y="230.58" width="100.48" height="104.25" rx="50.24" ry="50.24"></rect></svg> */
+}
diff --git a/dprint_plugin/tests/integration/dprint_ts/basic.astro.snap b/dprint_plugin/tests/integration/dprint_ts/basic.astro.snap
@@ -65,3 +65,15 @@ document.getElementById("button").addEventListener("click", handleClick);
 
 <!-- Below should be treated as text node. -->
 --- let title = 'My Site'; ---
+
+{
+  [].map((value) => {
+  console.log(value);
+
+  return <div></div><h1></h1>;
+  })
+}
+
+{
+  /* <svg><rect x="182.56" y="230.58" width="100.48" height="104.25" rx="50.24" ry="50.24"></rect></svg> */
+}
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
@@ -543,7 +543,7 @@ impl<'s> Parser<'s> {
         };
 
         let mut children = Vec::with_capacity(1);
-        let mut braces_stack = 0u8;
+        let mut pair_stack = vec![];
         let mut pos = self
             .chars
             .peek()
@@ -552,13 +552,13 @@ impl<'s> Parser<'s> {
         while let Some((i, c)) = self.chars.peek() {
             match c {
                 '{' => {
-                    braces_stack += 1;
+                    pair_stack.push('{');
                     self.chars.next();
                 }
                 '}' => {
                     let i = *i;
                     self.chars.next();
-                    if braces_stack == 0 {
+                    if pair_stack.is_empty() {
                         debug_assert!(matches!(
                             children.last(),
                             Some(AstroExprChild::Template(..)) | None
@@ -568,9 +568,9 @@ impl<'s> Parser<'s> {
                         }));
                         break;
                     }
-                    braces_stack -= 1;
+                    pair_stack.pop();
                 }
-                '<' => {
+                '<' if !matches!(pair_stack.last(), Some('/' | '*' | '\'' | '"' | '`')) => {
                     let i = *i;
                     let mut chars = self.chars.clone();
                     chars.next();
@@ -615,6 +615,46 @@ impl<'s> Parser<'s> {
                         self.chars.next();
                     }
                 }
+                '\'' | '"' | '`' => {
+                    let last = pair_stack.last();
+                    if last.is_some_and(|last| last == c) {
+                        pair_stack.pop();
+                    } else if matches!(last, Some('$' | '{') | None) {
+                        pair_stack.push(*c);
+                    }
+                    self.chars.next();
+                }
+                '$' if matches!(pair_stack.last(), Some('`')) => {
+                    self.chars.next();
+                    if self.chars.next_if(|(_, c)| *c == '{').is_some() {
+                        pair_stack.push('$');
+                    }
+                }
+                '/' if !matches!(pair_stack.last(), Some('\'' | '"' | '`')) => {
+                    self.chars.next();
+                    if let Some((_, c)) = self.chars.next_if(|(_, c)| *c == '/' || *c == '*') {
+                        pair_stack.push(c);
+                    }
+                }
+                '\n' => {
+                    self.chars.next();
+                    if let Some('/') = pair_stack.last() {
+                        pair_stack.pop();
+                    }
+                }
+                '*' => {
+                    self.chars.next();
+                    if self
+                        .chars
+                        .next_if(|(_, c)| *c == '/' && matches!(pair_stack.last(), Some('*')))
+                        .is_some()
+                    {
+                        pair_stack.pop();
+                    }
+                }
+                '\\' if matches!(pair_stack.last(), Some('\'' | '"' | '`')) => {
+                    self.chars.next();
+                }
                 _ => {
                     self.chars.next();
                 }