Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add autofix to function-calc-no-unspaced-operator #5273

Merged
merged 13 commits into from May 17, 2021
Merged

Add autofix to function-calc-no-unspaced-operator #5273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e96f707
Add autofix to function-calc-no-unspaced-operator
doing-art May 1, 2021
c51b752
Refactor autofix of function-calc-no-unspaced-operator
doing-art May 2, 2021
93c7385
Implement autofix for function-calc-no-unspaced-operator rule
doing-art May 4, 2021
7633208
Refactor autofix for function-calc-no-unspaced-operator rule
doing-art May 4, 2021
b4ac037
Fix tests of function-calc-no-unspaced-operator rule
doing-art May 4, 2021
1573ef4
Update documentation of function-calc-no-unspaced-operator rule
doing-art May 4, 2021
2e59c26
Update lib/rules/function-calc-no-unspaced-operator/index.js
doing-art May 16, 2021
6d3494a
Update lib/rules/function-calc-no-unspaced-operator/index.js
doing-art May 16, 2021
c97021b
Update lib/rules/function-calc-no-unspaced-operator/index.js
doing-art May 16, 2021
d5a479c
Update lib/rules/function-calc-no-unspaced-operator/index.js
doing-art May 16, 2021
1177685
Refactor autofix of function-calc-no-unspaced-operator
doing-art May 16, 2021
0c3ca34
Merge branch 'v14' into feature/4866_add_autofix_to_function-calc-no-…
doing-art May 17, 2021
e5c45be
Fix ESLint issue
doing-art May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/rules/function-calc-no-unspaced-operator/README.md
View file
Open in desktop
Expand Up @@ -11,6 +11,8 @@ a { top: calc(1px + 2px); }

Before the operator, there must be a single whitespace or a newline plus indentation. After the operator, there must be a single whitespace or a newline.

The [`fix` option](../../../docs/user-guide/usage/options.md#fix) can automatically fix all of the problems reported by this rule.

## Options

### `true`
Expand Down
103 changes: 103 additions & 0 deletions lib/rules/function-calc-no-unspaced-operator/__tests__/index.js
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@ const { messages, ruleName } = require('..');
testRule({
ruleName,
config: [true],
fix: true,

accept: [
{
Expand Down Expand Up @@ -155,235 +156,337 @@ testRule({
reject: [
{
code: 'a { top: calc(1px +\t-1px)}',
fixed: 'a { top: calc(1px + -1px)}',
description: 'tab before sign after operator',
message: messages.expectedAfter('+'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(1px + -1px)}',
fixed: 'a { top: calc(1px + -1px)}',
description: 'multiple spaces before sign after operator',
message: messages.expectedAfter('+'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(1px+ 2px); }',
fixed: 'a { top: calc(1px + 2px); }',
message: messages.expectedBefore('+'),
line: 1,
column: 18,
},
{
code: 'a { top: cAlC(1px+ 2px); }',
fixed: 'a { top: cAlC(1px + 2px); }',
message: messages.expectedBefore('+'),
line: 1,
column: 18,
},
{
code: 'a { top: CALC(1px+ 2px); }',
fixed: 'a { top: CALC(1px + 2px); }',
message: messages.expectedBefore('+'),
line: 1,
column: 18,
},
{
code: 'a { top: calc(1px + 2px); }',
fixed: 'a { top: calc(1px + 2px); }',
message: messages.expectedBefore('+'),
line: 1,
column: 20,
},
{
code: 'a { top: calc(1px\t+ 2px); }',
fixed: 'a { top: calc(1px + 2px); }',
message: messages.expectedBefore('+'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(1px + 2px); }',
fixed: 'a { top: calc(1px + 2px); }',
message: messages.expectedAfter('+'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(1px +\t2px); }',
fixed: 'a { top: calc(1px + 2px); }',
message: messages.expectedAfter('+'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(1px- 2px); }',
fixed: 'a { top: calc(1px - 2px); }',
message: messages.expectedBefore('-'),
line: 1,
column: 18,
},
{
code: 'a { top: calc(1px* 2); }',
fixed: 'a { top: calc(1px * 2); }',
message: messages.expectedBefore('*'),
line: 1,
column: 18,
},
{
code: 'a { top: calc(1px *2); }',
fixed: 'a { top: calc(1px * 2); }',
message: messages.expectedAfter('*'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(1px/ 2); }',
fixed: 'a { top: calc(1px / 2); }',
message: messages.expectedBefore('/'),
line: 1,
column: 18,
},
{
code: 'a { top: calc(1px /2); }',
fixed: 'a { top: calc(1px / 2); }',
message: messages.expectedAfter('/'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(calc(1px* 2px) + 3px); }',
fixed: 'a { top: calc(calc(1px * 2px) + 3px); }',
message: messages.expectedBefore('*'),
line: 1,
column: 23,
},
{
code: 'a { top: calc(calc(1px + 2px)* 3px); }',
fixed: 'a { top: calc(calc(1px + 2px) * 3px); }',
message: messages.expectedBefore('*'),
line: 1,
column: 30,
},
{
code: 'a { top: calc(1px +2px); }',
fixed: 'a { top: calc(1px + 2px); }',
message: messages.expectedOperatorBeforeSign('+'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(1px -2px); }',
fixed: 'a { top: calc(1px - 2px); }',
message: messages.expectedOperatorBeforeSign('-'),
line: 1,
column: 19,
},
{
code: 'a { padding: 10px calc(1px +\t-1px)}',
fixed: 'a { padding: 10px calc(1px + -1px)}',
description: 'tab before sign after operator',
message: messages.expectedAfter('+'),
line: 1,
column: 28,
},
{
code: 'a { padding: 10px calc(1px + -1px)}',
fixed: 'a { padding: 10px calc(1px + -1px)}',
description: 'multiple spaces before sign after operator',
message: messages.expectedAfter('+'),
line: 1,
column: 28,
},
{
code: 'a { padding: 10px calc(1px+ 2px); }',
fixed: 'a { padding: 10px calc(1px + 2px); }',
message: messages.expectedBefore('+'),
line: 1,
column: 27,
},
{
code: 'a { padding: 10px calc(1px + 2px); }',
fixed: 'a { padding: 10px calc(1px + 2px); }',
message: messages.expectedBefore('+'),
line: 1,
column: 29,
},
{
code: 'a { padding: 10px calc(1px\t+ 2px); }',
fixed: 'a { padding: 10px calc(1px + 2px); }',
message: messages.expectedBefore('+'),
line: 1,
column: 28,
},
{
code: 'a { padding: 10px calc(1px + 2px); }',
fixed: 'a { padding: 10px calc(1px + 2px); }',
message: messages.expectedAfter('+'),
line: 1,
column: 28,
},
{
code: 'a { padding: 10px calc(1px +\t2px); }',
fixed: 'a { padding: 10px calc(1px + 2px); }',
message: messages.expectedAfter('+'),
line: 1,
column: 28,
},
{
code: 'a { padding: 10px calc(1px- 2px); }',
fixed: 'a { padding: 10px calc(1px - 2px); }',
message: messages.expectedBefore('-'),
line: 1,
column: 27,
},
{
code: 'a { padding: 10px calc(1px* 2); }',
fixed: 'a { padding: 10px calc(1px * 2); }',
message: messages.expectedBefore('*'),
line: 1,
column: 27,
},
{
code: 'a { padding: 10px calc(1px *2); }',
fixed: 'a { padding: 10px calc(1px * 2); }',
message: messages.expectedAfter('*'),
line: 1,
column: 28,
},
{
code: 'a { padding: 10px calc(1px/ 2); }',
fixed: 'a { padding: 10px calc(1px / 2); }',
message: messages.expectedBefore('/'),
line: 1,
column: 27,
},
{
code: 'a { padding: 10px calc(1px /2); }',
fixed: 'a { padding: 10px calc(1px / 2); }',
message: messages.expectedAfter('/'),
line: 1,
column: 28,
},
{
code: 'a { padding: 10px calc(calc(1px* 2px) + 3px); }',
fixed: 'a { padding: 10px calc(calc(1px * 2px) + 3px); }',
message: messages.expectedBefore('*'),
line: 1,
column: 32,
},
{
code: 'a { padding: 10px calc(calc(1px + 2px)* 3px); }',
fixed: 'a { padding: 10px calc(calc(1px + 2px) * 3px); }',
message: messages.expectedBefore('*'),
line: 1,
column: 39,
},
{
code: 'a { padding: 10px calc(1px +2px); }',
fixed: 'a { padding: 10px calc(1px + 2px); }',
message: messages.expectedOperatorBeforeSign('+'),
line: 1,
column: 28,
},
{
code: 'a { padding: 10px calc(1px -2px); }',
fixed: 'a { padding: 10px calc(1px - 2px); }',
message: messages.expectedOperatorBeforeSign('-'),
line: 1,
column: 28,
},
{
code: 'a { padding: calc(1rem\t + 1em)}',
fixed: 'a { padding: calc(1rem + 1em)}',
description: 'several whitespace characters before operator starting from space',
message: messages.expectedBefore('+'),
line: 1,
column: 25,
},
{
code: 'a { padding: calc(1rem \t+ 1em)}',
fixed: 'a { padding: calc(1rem + 1em)}',
description: 'several whitespace characters before operator starting from tab',
message: messages.expectedBefore('+'),
line: 1,
column: 26,
},
{
code: 'a { padding: calc(1rem\t\f\r\t+ 1em)}',
fixed: 'a { padding: calc(1rem + 1em)}',
description: 'several incorrect whitespace characters before operator',
message: messages.expectedBefore('+'),
line: 1,
column: 27,
},
{
code: 'a { padding: calc(1rem + \t1em)}',
fixed: 'a { padding: calc(1rem + 1em)}',
description: 'several whitespace characters after operator starting from space',
message: messages.expectedAfter('+'),
line: 1,
column: 24,
},
{
code: 'a { padding: calc(1rem +\t \t1em)}',
fixed: 'a { padding: calc(1rem + 1em)}',
description: 'several whitespace characters after operator starting from tab',
message: messages.expectedAfter('+'),
line: 1,
column: 24,
},
{
code: 'a { padding: calc(1rem +\t\r\f\t1em)}',
fixed: 'a { padding: calc(1rem + 1em)}',
description: 'several incorrect whitespace characters after operator',
message: messages.expectedAfter('+'),
line: 1,
column: 24,
},
{
code: 'a { padding: calc(1rem +\t \t\f\n\f\t1em)}',
fixed: 'a { padding: calc(1rem +\n\f\t1em)}',
description: 'several whitespace characters after operator but before the \\n',
message: messages.expectedAfter('+'),
line: 1,
column: 24,
},
{
code: 'a { padding: calc(1rem + \t\r\n 1em)}',
fixed: 'a { padding: calc(1rem +\r\n 1em)}',
description: 'several whitespace characters after operator but before the \\r\\n',
message: messages.expectedAfter('+'),
line: 1,
column: 24,
},
],
});

testRule({
ruleName,
config: [true],
customSyntax: postcssScss,
fix: true,

reject: [
{
code: 'a { top: calc(100%- #{$foo}); }',
fixed: 'a { top: calc(100% - #{$foo}); }',
message: messages.expectedBefore('-'),
line: 1,
column: 19,
},
{
code: 'a { top: calc(100% *#{$foo}); }',
fixed: 'a { top: calc(100% * #{$foo}); }',
message: messages.expectedAfter('*'),
line: 1,
column: 20,
},
{
code: 'a { top: calc(100% -#{$foo}); }',
fixed: 'a { top: calc(100% - #{$foo}); }',
message: messages.expectedOperatorBeforeSign('-'),
line: 1,
column: 20,
Expand Down