Skip to content

Commit

Permalink
Improve message of function-url-quotes rule (#5488)
Browse files Browse the repository at this point in the history 
This change is derived from the discussion:
https://github.com/stylelint/stylelint/pull/5487/files#r692264717

A new message will include a problematic function name like this:

```diff
-Expected quotes
+Expected quotes around "url" function argument
```
  • Loading branch information
@ybiquitous
ybiquitous committed Aug 20, 2021
1 parent 544d857 commit d555890
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 47 deletions.
90 changes: 45 additions & 45 deletions lib/rules/function-url-quotes/__tests__/index.js
View file
Expand Up @@ -180,13 +180,13 @@ testRule({
reject: [
{
code: '@import url(foo.css);',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 13,
},
{
code: '@import url( foo.css );',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 14,
},
Expand All @@ -204,55 +204,55 @@ testRule({
},
{
code: "@font-face { font-family: 'foo'; src: url(foo.ttf); }",
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 43,
},
{
code: "@font-face { font-family: 'foo'; src: url( foo.ttf ); }",
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 44,
},
{
code: 'a { cursor: url(foo.png); }',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 17,
},
{
code: 'a { background-image: url(foo.css), url("bar.css"), url("baz.css"); }',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 27,
},
{
code: 'a { background-image: url( foo.css ), url("bar.css"), url("baz.css"); }',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 28,
},
{
code: 'a { background-image: url("foo.css"), url(bar.css), url("baz.css"); }',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 43,
},
{
code: 'a { background-image: url("foo.css"), url( bar.css ), url("baz.css"); }',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 44,
},
{
code: 'a { background-image: url("foo.css"), url("bar.css"), url(baz.css); }',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 59,
},
{
code: 'a { background-image: url("foo.css"), url("bar.css"), url( baz.css ); }',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 60,
},
Expand Down Expand Up @@ -371,49 +371,49 @@ testRule({
reject: [
{
code: '@import url("foo.css");',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 13,
},
{
code: '@import uRl("foo.css");',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 13,
},
{
code: '@import URL("foo.css");',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 13,
},
{
code: '@import url( "foo.css" );',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 14,
},
{
code: "@import url('foo.css');",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 13,
},
{
code: "@import url( 'foo.css' );",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 14,
},
{
code: '@document url("http://www.w3.org/");',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 15,
},
{
code: '@document url( "http://www.w3.org/" );',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 16,
},
Expand Down Expand Up @@ -443,91 +443,91 @@ testRule({
},
{
code: "@font-face { font-family: foo; src: url('foo.ttf'); }",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 41,
},
{
code: "@font-face { font-family: foo; src: url( 'foo.ttf' ); }",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 42,
},
{
code: 'a { background: url("foo.css"); }',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 21,
},
{
code: 'a { background: uRl("foo.css"); }',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 21,
},
{
code: 'a { background: URL("foo.css"); }',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 21,
},
{
code: 'a { background: url( "foo.css" ); }',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 22,
},
{
code: 'a { background: url( "foo.css" ); }',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 23,
},
{
code: 'a { cursor: url("foo.png"); }',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 17,
},
{
code: "a { background-image: url('foo.css'), url(bar.css), url(baz.css); }",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 27,
},
{
code: "a { background-image: url( 'foo.css' ), url(bar.css), url(baz.css); }",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 28,
},
{
code: "a { background-image: url(foo.css), url('bar.css'), url(baz.css); }",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 41,
},
{
code: "a { background-image: url(foo.css), url( 'bar.css' ), url(baz.css); }",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 42,
},
{
code: "a { background-image: url(foo.css), url(bar.css), url('baz.css'); }",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 55,
},
{
code: "a { background-image: url(foo.css), url(bar.css), url( 'baz.css' ); }",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 56,
},
{
code: 'a { background: url("/images/my_image@2x.png") }',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 21,
},
Expand All @@ -550,19 +550,19 @@ testRule({
reject: [
{
code: '@import url(foo.css);',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 13,
},
{
code: "@import url('');",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 13,
},
{
code: '@import url("");',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 13,
},
Expand Down Expand Up @@ -591,21 +591,21 @@ testRule({
reject: [
{
code: '@-moz-document url-prefix() {}',
message: messages.expected(),
message: messages.expected('url-prefix'),
},
{
code: 'a { background: url() }',
message: messages.expected(),
message: messages.expected('url'),
},
{
code: '@import url("foo.css");',
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 13,
},
{
code: "@import url('foo.css');",
message: messages.rejected(),
message: messages.rejected('url'),
line: 1,
column: 13,
},
Expand All @@ -621,13 +621,13 @@ testRule({
reject: [
{
code: '<template><a style="background: url(foo.css);"></a><template>',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 37,
},
{
code: '<html><head><style>a { background: url(foo.css); }</style></head></html>',
message: messages.expected(),
message: messages.expected('url'),
line: 1,
column: 40,
},
Expand All @@ -653,13 +653,13 @@ testRule({
reject: [
{
code: 'import styled from "styled-components";\nexport default styled.div` background: url(foo.css); `;',
message: messages.expected(),
message: messages.expected('url'),
line: 2,
column: 44,
},
{
code: 'import styled from "react-emotion";\nexport default styled.div` background: url(foo.css); `;',
message: messages.expected(),
message: messages.expected('url'),
line: 2,
column: 44,
},
Expand Down
4 changes: 2 additions & 2 deletions lib/rules/function-url-quotes/index.js
View file
Expand Up @@ -13,8 +13,8 @@ const validateOptions = require('../../utils/validateOptions');
const ruleName = 'function-url-quotes';

const messages = ruleMessages(ruleName, {
expected: () => 'Expected quotes',
rejected: () => 'Unexpected quotes',
expected: (functionName) => `Expected quotes around "${functionName}" function argument`,
rejected: (functionName) => `Unexpected quotes around "${functionName}" function argument`,
});

function rule(expectation, options) {
Expand Down

0 comments on commit d555890

Please sign in to comment.