From 9fcd4ec1a8feff3baedc85ae9735f92bcfb62d44 Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Thu, 20 Oct 2022 13:34:02 +0200 Subject: [PATCH 1/2] Add tests for {{! prettier-ignore}} --- .../__snapshots__/jsfmt.spec.js.snap | 26 +++++++++++++++++++ .../prettier-ignore/prettier-ignore.hbs | 13 ++++++++++ 2 files changed, 39 insertions(+) diff --git a/tests/format/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap b/tests/format/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap index de2480488e71..623ea54b1854 100644 --- a/tests/format/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap @@ -6,6 +6,19 @@ parsers: ["glimmer"] printWidth: 80 | printWidth =====================================input====================================== +{{! prettier-ignore }} +{{ ugly}} + +{{! prettier-ignore }} + ugly + +{{! prettier-ignore }} +{{# ugly}} +{{/ ugly}} + +{{! prettier-ignore }} +{{! ugly}} + {{! prettier-ignore }}
"hello! my parent was ignored" @@ -41,6 +54,19 @@ printWidth: 80 {{/another-sibling}}
=====================================output===================================== +{{! prettier-ignore }} +{{ ugly}} + +{{! prettier-ignore }} +ugly + +{{! prettier-ignore }} +{{# ugly}} +{{/ ugly}} + +{{! prettier-ignore }} +{{! ugly}} + {{! prettier-ignore }}
"hello! my parent was ignored" diff --git a/tests/format/handlebars/prettier-ignore/prettier-ignore.hbs b/tests/format/handlebars/prettier-ignore/prettier-ignore.hbs index cfe3574a198e..dc36817b6b7d 100644 --- a/tests/format/handlebars/prettier-ignore/prettier-ignore.hbs +++ b/tests/format/handlebars/prettier-ignore/prettier-ignore.hbs @@ -1,3 +1,16 @@ +{{! prettier-ignore }} +{{ ugly}} + +{{! prettier-ignore }} + ugly + +{{! prettier-ignore }} +{{# ugly}} +{{/ ugly}} + +{{! prettier-ignore }} +{{! ugly}} + {{! prettier-ignore }}
"hello! my parent was ignored" From 816b1a4efedd535123fa8a2f99e4d16ef2046caf Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Thu, 20 Oct 2022 13:43:37 +0200 Subject: [PATCH 2/2] Add tests for {{! prettier-ignore}} when the next relevant node is right after the directive --- .../__snapshots__/jsfmt.spec.js.snap | 18 ++++++++++++++++++ .../prettier-ignore/prettier-ignore.hbs | 10 +++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/tests/format/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap b/tests/format/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap index 623ea54b1854..68980791de3f 100644 --- a/tests/format/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap @@ -9,16 +9,24 @@ printWidth: 80 {{! prettier-ignore }} {{ ugly}} +{{! prettier-ignore }}{{ ugly}} + {{! prettier-ignore }} ugly +{{! prettier-ignore }} ugly + {{! prettier-ignore }} {{# ugly}} {{/ ugly}} +{{! prettier-ignore }}{{# ugly}}{{/ ugly}} + {{! prettier-ignore }} {{! ugly}} +{{! prettier-ignore }}{{! ugly}} + {{! prettier-ignore }}
"hello! my parent was ignored" @@ -53,10 +61,16 @@ printWidth: 80 {{/another-sibling}}
+ =====================================output===================================== {{! prettier-ignore }} {{ ugly}} +{{! prettier-ignore }}{{ugly}} + +{{! prettier-ignore }} +ugly + {{! prettier-ignore }} ugly @@ -64,9 +78,13 @@ ugly {{# ugly}} {{/ ugly}} +{{! prettier-ignore }}{{#ugly}}{{/ugly}} + {{! prettier-ignore }} {{! ugly}} +{{! prettier-ignore }}{{! ugly}} + {{! prettier-ignore }}
"hello! my parent was ignored" diff --git a/tests/format/handlebars/prettier-ignore/prettier-ignore.hbs b/tests/format/handlebars/prettier-ignore/prettier-ignore.hbs index dc36817b6b7d..b2a3b5c0a5ef 100644 --- a/tests/format/handlebars/prettier-ignore/prettier-ignore.hbs +++ b/tests/format/handlebars/prettier-ignore/prettier-ignore.hbs @@ -1,16 +1,24 @@ {{! prettier-ignore }} {{ ugly}} +{{! prettier-ignore }}{{ ugly}} + {{! prettier-ignore }} ugly +{{! prettier-ignore }} ugly + {{! prettier-ignore }} {{# ugly}} {{/ ugly}} +{{! prettier-ignore }}{{# ugly}}{{/ ugly}} + {{! prettier-ignore }} {{! ugly}} +{{! prettier-ignore }}{{! ugly}} + {{! prettier-ignore }}
"hello! my parent was ignored" @@ -44,4 +52,4 @@
{{/another-sibling}} -
\ No newline at end of file +