From 3e3e3deebc6718d1b0ed88c509e6fc89731bc1f2 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 24 Oct 2024 16:33:53 +0800 Subject: [PATCH] fix: fix script contains template nested interpolation --- .../tests/integration/biome/indent.html.snap | 44 +++++++++++++++++++ .../integration/dprint_ts/indent.html.snap | 43 ++++++++++++++++++ dprint_plugin/tests/integration/indent.html | 39 ++++++++++++++++ markup_fmt/src/printer.rs | 3 ++ 4 files changed, 129 insertions(+) diff --git a/dprint_plugin/tests/integration/biome/indent.html.snap b/dprint_plugin/tests/integration/biome/indent.html.snap index 3d18ec0..75e1096 100644 --- 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`; } + + + + + + diff --git a/dprint_plugin/tests/integration/dprint_ts/indent.html.snap b/dprint_plugin/tests/integration/dprint_ts/indent.html.snap index 3d18ec0..32b5490 100644 --- 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`; } + + + + + + diff --git a/dprint_plugin/tests/integration/indent.html b/dprint_plugin/tests/integration/indent.html index 0faf046..f27370a 100644 --- a/dprint_plugin/tests/integration/indent.html +++ b/dprint_plugin/tests/integration/indent.html @@ -4,3 +4,42 @@ second line`; } + + + + + + diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs index a1e8932..429e82c 100644 --- 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> + pair_stack.push('$'); } } + '{' => { + pair_stack.push('{'); + } '}' if matches!(pair_stack.last(), Some('$' | '{')) => { pair_stack.pop(); }