diff --git a/dprint_plugin/tests/integration/basic.svelte b/dprint_plugin/tests/integration/basic.svelte index ff95c62..1a8f153 100644 --- a/dprint_plugin/tests/integration/basic.svelte +++ b/dprint_plugin/tests/integration/basic.svelte @@ -22,3 +22,5 @@ function generateHtml(data:unknown) { {#if Math.random( )>0.5}...{:else if Date.now( )>0 }...{/if} {#key 1+2}s{/key} + + diff --git a/dprint_plugin/tests/integration/basic.vue b/dprint_plugin/tests/integration/basic.vue index 306af94..31e5f64 100644 --- a/dprint_plugin/tests/integration/basic.vue +++ b/dprint_plugin/tests/integration/basic.vue @@ -17,4 +17,5 @@ function greet(msg:string){alert(msg)} + diff --git a/dprint_plugin/tests/integration/biome/basic.svelte.snap b/dprint_plugin/tests/integration/biome/basic.svelte.snap index 86e7ac6..ab87f3d 100644 --- a/dprint_plugin/tests/integration/biome/basic.svelte.snap +++ b/dprint_plugin/tests/integration/biome/basic.svelte.snap @@ -30,3 +30,5 @@ function generateHtml(data: unknown) { {#key 1 + 2}s{/key} + + diff --git a/dprint_plugin/tests/integration/biome/basic.vue.snap b/dprint_plugin/tests/integration/biome/basic.vue.snap index 2e46256..27b8228 100644 --- a/dprint_plugin/tests/integration/biome/basic.vue.snap +++ b/dprint_plugin/tests/integration/biome/basic.vue.snap @@ -23,5 +23,6 @@ function greet(msg: string) { > + diff --git a/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap b/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap index 6cfd01a..44202d1 100644 --- a/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap +++ b/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap @@ -30,3 +30,5 @@ function generateHtml(data: unknown) { {#key 1 + 2}s{/key} + + diff --git a/dprint_plugin/tests/integration/dprint_ts/basic.vue.snap b/dprint_plugin/tests/integration/dprint_ts/basic.vue.snap index e754ca9..7b0b97a 100644 --- a/dprint_plugin/tests/integration/dprint_ts/basic.vue.snap +++ b/dprint_plugin/tests/integration/dprint_ts/basic.vue.snap @@ -23,5 +23,6 @@ function greet(msg: string) { > + diff --git a/markup_fmt/src/ctx.rs b/markup_fmt/src/ctx.rs index ef50bbf..00c600e 100644 --- a/markup_fmt/src/ctx.rs +++ b/markup_fmt/src/ctx.rs @@ -93,9 +93,9 @@ where // Trim original code before sending it to the external formatter. // This makes sure the code will be trimmed // though external formatter isn't available. - let wrapped = format!("let e = {}", code.trim()); + let wrapped = format!("<>{{{}}}", code.trim()); let formatted = self.format_with_external_formatter( - Path::new("expr.ts"), + Path::new("expr.tsx"), &wrapped, self.print_width .saturating_sub(self.indent_level) @@ -104,8 +104,10 @@ where let formatted = formatted.trim_end_matches(|c: char| c.is_ascii_whitespace() || c == ';'); formatted - .strip_prefix("let e =") + .strip_prefix("<>{") + .and_then(|s| s.strip_suffix("}")) .unwrap_or(formatted) + .trim_end_matches(|c: char| c.is_ascii_whitespace() || c == ';') .trim_start() .to_owned() }