vitalif-js
/
prettier
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: don't add comma after `url` in `@import` directive (#3770)

master
Evilebot Tnawi 2018-01-20 02:56:28 +03:00 committed by suchipi
parent 17b3df9b8e
commit 12441eb2dd
3 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/language-css/printer-postcss.js
View File

@ -175,10 +175,17 @@ function genericPrint(path, options, print) {
}
parts.push(childPath.call(print));
}, "nodes");
return group(indent(join(concat([",", line]), parts)));
return group(indent(join(line, parts)));
}
case "media-query": {
return join(" ", path.map(print, "nodes"));
const parent = path.getParentNode();
const isLastNode = parent.nodes.indexOf(n) === parent.nodes.length - 1;
return concat([
join(" ", path.map(print, "nodes")),
isLastNode ? "" : ","
]);
}
case "media-type": {
const parent = path.getParentNode(2);

47
tests/css_import/__snapshots__/jsfmt.spec.js.snap
View File

@ -39,8 +39,55 @@ exports[`nodes.css 1`] = `
exports[`url.css 1`] = `
@import url('foo');
$dir: 'fonts';
@import url("foo.css");
@import url('foo.css');
@import url("foo.css");
@import url("foo.css");
@import url("fineprint.css")print;
@import url("fineprint.css") print;
@import url("fineprint.css") print;
@import url("fineprint.css")
print;
@import url("bluish.css") projection,tv;
@import url("bluish.css") projection, tv;
@import url("bluish.css") projection ,tv;
@import url("bluish.css") projection , tv;
@import url("bluish.css") projection , tv;
@import url("bluish.css")
projection,
tv;
@import url("very-very-very-very-very-very-very-very-very-very-long-name.css") projection,tv;
@import url('landscape.css') screen and (orientation:landscape);
@import "rounded-corners", "text-shadow";
@import 'rounded-corners', 'text-shadow';
$family: unquote("Droid+Sans");
@import url("http://fonts.googleapis.com/css?family=#{$family}");
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@import url("foo");
$dir: "fonts";
@import url("foo.css");
@import url("foo.css");
@import url("foo.css");
@import url("foo.css");
@import url("fineprint.css") print;
@import url("fineprint.css") print;
@import url("fineprint.css") print;
@import url("fineprint.css") print;
@import url("bluish.css") projection, tv;
@import url("bluish.css") projection, tv;
@import url("bluish.css") projection, tv;
@import url("bluish.css") projection, tv;
@import url("bluish.css") projection, tv;
@import url("bluish.css") projection, tv;
@import url("very-very-very-very-very-very-very-very-very-very-long-name.css")
projection,
tv;
@import url("landscape.css") screen and (orientation: landscape);
@import "rounded-corners", "text-shadow";
@import "rounded-corners", "text-shadow";
$family: unquote("Droid+Sans");
@import url("http://fonts.googleapis.com/css?family=#{$family}");
`;

24
tests/css_import/url.css
View File

@ -1,2 +1,26 @@
@import url('foo');
$dir: 'fonts';
@import url("foo.css");
@import url('foo.css');
@import url("foo.css");
@import url("foo.css");
@import url("fineprint.css")print;
@import url("fineprint.css") print;
@import url("fineprint.css") print;
@import url("fineprint.css")
print;
@import url("bluish.css") projection,tv;
@import url("bluish.css") projection, tv;
@import url("bluish.css") projection ,tv;
@import url("bluish.css") projection , tv;
@import url("bluish.css") projection , tv;
@import url("bluish.css")
projection,
tv;
@import url("very-very-very-very-very-very-very-very-very-very-long-name.css") projection,tv;
@import url('landscape.css') screen and (orientation:landscape);
@import "rounded-corners", "text-shadow";
@import 'rounded-corners', 'text-shadow';
$family: unquote("Droid+Sans");
@import url("http://fonts.googleapis.com/css?family=#{$family}");