fix: don't add comma after `url` in `@import` directive (#3770)
parent
17b3df9b8e
commit
12441eb2dd
|
@ -175,10 +175,17 @@ function genericPrint(path, options, print) {
|
||||||
}
|
}
|
||||||
parts.push(childPath.call(print));
|
parts.push(childPath.call(print));
|
||||||
}, "nodes");
|
}, "nodes");
|
||||||
return group(indent(join(concat([",", line]), parts)));
|
|
||||||
|
return group(indent(join(line, parts)));
|
||||||
}
|
}
|
||||||
case "media-query": {
|
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": {
|
case "media-type": {
|
||||||
const parent = path.getParentNode(2);
|
const parent = path.getParentNode(2);
|
||||||
|
|
|
@ -39,8 +39,55 @@ exports[`nodes.css 1`] = `
|
||||||
exports[`url.css 1`] = `
|
exports[`url.css 1`] = `
|
||||||
@import url('foo');
|
@import url('foo');
|
||||||
$dir: 'fonts';
|
$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");
|
@import url("foo");
|
||||||
$dir: "fonts";
|
$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}");
|
||||||
|
|
||||||
`;
|
`;
|
||||||
|
|
|
@ -1,2 +1,26 @@
|
||||||
@import url('foo');
|
@import url('foo');
|
||||||
$dir: 'fonts';
|
$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}");
|
||||||
|
|
Loading…
Reference in New Issue