fix: fix script contains template nested interpolation

g-plane · Oct 24, 2024 · 3e3e3de · 3e3e3de
1 parent 48c2604
commit 3e3e3de
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 0 deletions.
diff --git a/dprint_plugin/tests/integration/biome/indent.html.snap b/dprint_plugin/tests/integration/biome/indent.html.snap
@@ -7,3 +7,47 @@ source: dprint_plugin/tests/integration.rs
    second line`;
   }
 </script>
+
+<html lang="en">
+  <body>
+    <script type="module">
+      const data = await (await fetch("./monthly-visits.json")).json();
+      const { title, labels, datasets } = data;
+      const fmt = new Intl.NumberFormat();
+
+      new frappe.Chart(document.getElementById("chart"), {
+        title,
+        type: "bar",
+        height: 300,
+        data: {
+          labels,
+          datasets: datasets.map(({ name, values }) => {
+            return { name, values, chartType: "bar" };
+          }),
+        },
+      });
+      document.title = title;
+      document.getElementById("title").innerText = title;
+      const details = document.getElementById("details");
+      details.innerHTML = `
+      ${datasets
+              .map(
+                ({ name, values }) => `
+        <h2>${name}</h2>
+        <dl>
+        ${labels
+                .map(
+                  (label, index) => `
+          <dt>${label}</dt>
+          <dd>${fmt.format(values[index])}</dd>
+        `,
+                )
+                .join("")}
+        </dl>
+      `,
+              )
+              .join("")}
+    `;
+    </script>
+  </body>
+</html>
diff --git a/dprint_plugin/tests/integration/dprint_ts/indent.html.snap b/dprint_plugin/tests/integration/dprint_ts/indent.html.snap
@@ -7,3 +7,46 @@ source: dprint_plugin/tests/integration.rs
    second line`;
   }
 </script>
+
+<html lang="en">
+  <body>
+    <script type="module">
+      const data = await (await fetch("./monthly-visits.json")).json();
+      const { title, labels, datasets } = data;
+      const fmt = new Intl.NumberFormat();
+
+      new frappe.Chart(
+        document.getElementById("chart"),
+        {
+          title,
+          type: "bar",
+          height: 300,
+          data: {
+            labels,
+            datasets: datasets.map(({ name, values }) => {
+              return { name, values, chartType: "bar" };
+            }),
+          },
+        },
+      );
+      document.title = title;
+      document.getElementById("title").innerText = title;
+      const details = document.getElementById("details");
+      details.innerHTML = `
+      ${
+        datasets.map(({ name, values }) => `
+        <h2>${name}</h2>
+        <dl>
+        ${
+          labels.map((label, index) => `
+          <dt>${label}</dt>
+          <dd>${fmt.format(values[index])}</dd>
+        `).join("")
+        }
+        </dl>
+      `).join("")
+      }
+    `;
+    </script>
+  </body>
+</html>
diff --git a/dprint_plugin/tests/integration/indent.html b/dprint_plugin/tests/integration/indent.html
@@ -4,3 +4,42 @@
    second line`;
 }
 </script>
+
+<html lang="en">
+<body>
+  <script type="module">
+    const data = await (await fetch("./monthly-visits.json")).json();
+    const { title, labels, datasets } = data;
+    const fmt = new Intl.NumberFormat();
+
+    new frappe.Chart(
+      document.getElementById("chart"),
+      {
+        title,
+        type: "bar",
+        height: 300,
+        data: {
+          labels,
+          datasets: datasets.map(({ name, values }) => {
+            return { name, values, chartType: "bar" };
+          }),
+        },
+      },
+    );
+    document.title = title;
+    document.getElementById("title").innerText = title;
+    const details = document.getElementById("details");
+    details.innerHTML = `
+      ${datasets.map(({ name, values }) => `
+        <h2>${name}</h2>
+        <dl>
+        ${labels.map((label, index) => `
+          <dt>${label}</dt>
+          <dd>${fmt.format(values[index])}</dd>
+        `).join("")}
+        </dl>
+      `).join("")}
+    `;
+  </script>
+</body>
+</html>
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
@@ -1768,6 +1768,9 @@ fn reflow_with_indent<'i, 'o: 'i>(s: &'i str) -> impl Iterator<Item = Doc<'o>> +
                         pair_stack.push('$');
                     }
                 }
+                '{' => {
+                    pair_stack.push('{');
+                }
                 '}' if matches!(pair_stack.last(), Some('$' | '{')) => {
                     pair_stack.pop();
                 }