Fix at-rule-no-unknown end positions
#655
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,10 @@ | ||
| const getTestRule = require("jest-preset-stylelint/getTestRule"); | ||
|
|
||
| global.testRule = getTestRule({ plugins: ["./src"] }); | ||
|
|
||
| // Inspired by https://www.npmjs.com/package/dedent-tag | ||
| global.dedent = function dedent(strings) { | ||
| return strings[0] | ||
| .replace(/^[ \t]+/gm, "") // remove indentation | ||
| .replace(/^\s*\n/gm, ""); // remove empty lines | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,6 +57,7 @@ | |
| "lodash" | ||
| ], | ||
| "globals": { | ||
| "dedent": true, | ||
| "testRule": true | ||
| }, | ||
| "rules": { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ const sassAtRules = [ | |
| "return", | ||
| "use", | ||
| "warn", | ||
| "while", | ||
| ]; | ||
|
|
||
| const ruleToCheckAgainst = "at-rule-no-unknown"; | ||
|
|
@@ -34,11 +34,11 @@ export const messages = utils.ruleMessages(ruleName, { | |
| return rules[ruleToCheckAgainst].messages | ||
| .rejected(...args) | ||
| .replace(` (${ruleToCheckAgainst})`, ""); | ||
| }, | ||
| }); | ||
|
|
||
| export const meta = { | ||
| url: ruleUrl(ruleName), | ||
| }; | ||
|
|
||
| export default function rule(primaryOption, secondaryOptions) { | ||
|
|
@@ -47,14 +47,14 @@ export default function rule(primaryOption, secondaryOptions) { | |
| result, | ||
| ruleName, | ||
| { | ||
| actual: primaryOption, | ||
| }, | ||
| { | ||
| actual: secondaryOptions, | ||
| possible: { | ||
| ignoreAtRules: [isRegExp, isString], | ||
| }, | ||
| optional: true, | ||
| } | ||
| ); | ||
|
|
||
|
|
@@ -65,16 +65,16 @@ export default function rule(primaryOption, secondaryOptions) { | |
| const optionsAtRules = secondaryOptions && secondaryOptions.ignoreAtRules; | ||
| const ignoreAtRules = sassAtRules.concat(optionsAtRules || []); | ||
| const defaultedOptions = Object.assign({}, secondaryOptions, { | ||
| ignoreAtRules, | ||
| }); | ||
|
|
||
| utils.checkAgainstRule( | ||
| { | ||
| ruleName: ruleToCheckAgainst, | ||
| ruleSettings: [primaryOption, defaultedOptions], | ||
| root, | ||
| }, | ||
| (warning) => { | ||
| const name = warning.node.name; | ||
|
|
||
| if (!ignoreAtRules.includes(name)) { | ||
|
|
@@ -83,8 +83,8 @@ export default function rule(primaryOption, secondaryOptions) { | |
| ruleName, | ||
| result, | ||
| node: warning.node, | ||
| start: { line: warning.line, column: warning.column }, | ||
| end: { line: warning.endLine, column: warning.endColumn }, | ||
|
There was a problem hiding this comment. @ybiquitous is this a backwards compatible change? There was a problem hiding this comment. Good point. I tried testing the minimum version of Lines 40 to 42 in efd565d $ npm i stylelint@14.5.1
...
$ npx jest at-rule-no-unknown --no-verbose
FAIL src/rules/at-rule-no-unknown/__tests__/index.js
● scss/at-rule-no-unknown › reject › [ true ] › '@funciton floo ($n) {}\n' › no description
expect(received).toMatchObject(expected)
- Expected - 2
+ Received + 0
Object {
"column": 1,
- "endColumn": 10,
- "endLine": 1,
"line": 1,
"text": "Unexpected unknown at-rule \"@funciton\" (scss/at-rule-no-unknown)",
}
at Object.<anonymous> (node_modules/jest-preset-stylelint/getTestRule.js:88:33)It seems that the backward compatibility keeps. 👍🏼 If possible, I think it's better to update |
||
| }); | ||
| } | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[note] It seems to me that one case change is enough to test end positions.