From 3e924474cd9f2ae1538a6cb1913c3d76b732b362 Mon Sep 17 00:00:00 2001 From: Simon Lydell Date: Mon, 21 Aug 2017 21:28:22 +0200 Subject: [PATCH] Print sub-nodes of `@import` in Less (#2646) Fixes part of #2584. --- src/printer-postcss.js | 11 ++++++++++- .../css_import/__snapshots__/jsfmt.spec.js.snap | 17 +++++++++++++++++ tests/css_import/nodes.css | 6 ++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/css_import/nodes.css diff --git a/src/printer-postcss.js b/src/printer-postcss.js index ba093eef..437f6cc7 100644 --- a/src/printer-postcss.js +++ b/src/printer-postcss.js @@ -129,7 +129,16 @@ function genericPrint(path, options, print) { " ", n.directives ? concat([n.directives, " "]) : "", adjustStrings(n.importPath, options), - ";" + n.nodes.length > 0 + ? concat([ + " {", + indent( + concat([softline, printNodeSequence(path, options, print)]) + ), + softline, + "}" + ]) + : ";" ]); } // postcss-media-query-parser diff --git a/tests/css_import/__snapshots__/jsfmt.spec.js.snap b/tests/css_import/__snapshots__/jsfmt.spec.js.snap index 8e86bed1..00af9e8c 100644 --- a/tests/css_import/__snapshots__/jsfmt.spec.js.snap +++ b/tests/css_import/__snapshots__/jsfmt.spec.js.snap @@ -7,6 +7,23 @@ exports[`directives.css 1`] = ` `; +exports[`nodes.css 1`] = ` +@import "test.less" {} + +@import "test.less" { + a: b; + c: d; +} +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@import "test.less"; + +@import "test.less" { + a: b; + c: d; +} + +`; + exports[`url.css 1`] = ` @import url('foo'); $dir: 'fonts'; diff --git a/tests/css_import/nodes.css b/tests/css_import/nodes.css new file mode 100644 index 00000000..f2862f02 --- /dev/null +++ b/tests/css_import/nodes.css @@ -0,0 +1,6 @@ +@import "test.less" {} + +@import "test.less" { + a: b; + c: d; +}