From 9461237aa2d420326e72adc5cf3a2e63b9454596 Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Tue, 16 Aug 2022 15:07:16 +0200 Subject: [PATCH] Code review feedback --- .../src/js/expressions/template_element.rs | 6 +++--- .../tests/specs/js/module/template/template.js | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/rome_js_formatter/src/js/expressions/template_element.rs b/crates/rome_js_formatter/src/js/expressions/template_element.rs index 92d01e0b6bf1..683ba0049d33 100644 --- a/crates/rome_js_formatter/src/js/expressions/template_element.rs +++ b/crates/rome_js_formatter/src/js/expressions/template_element.rs @@ -210,18 +210,18 @@ where return write!(f, [content]); } - // Adds as many nested `indent` elements until it reaches the desired indent level. + // Adds as many nested `indent` elements until it reaches the desired indention level. let format_indented = format_with(|f| { if level == 0 { write!(f, [content]) } else { let mut buffer = VecBuffer::new(f.state_mut()); - write!(buffer, [indent(content)])?; + write!(buffer, [content])?; let mut indented = buffer.into_element(); - for _ in 1..level { + for _ in 0..level { indented = FormatElement::Indent(vec![indented].into_boxed_slice()); } diff --git a/crates/rome_js_formatter/tests/specs/js/module/template/template.js b/crates/rome_js_formatter/tests/specs/js/module/template/template.js index f16c15e67fdc..7c4d033b70d8 100644 --- a/crates/rome_js_formatter/tests/specs/js/module/template/template.js +++ b/crates/rome_js_formatter/tests/specs/js/module/template/template.js @@ -17,9 +17,11 @@ output output `; -// don't break +// Single Line const bar =`but where will ${this.fanta} wrap ${baz} ${"hello"} template literal? ${bar.ff.sss} long long long long ${foo[3]} long long long long long long`; + +// Fit const foo = `but where will ${a && b && bar || c && d && g} wrap long long long long long long`; const foo = `but where will ${lorem && loremlorem && loremlorem || loremc && lorem && loremlorem} wrap long long long long long long`;