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

Fix selector-pseudo-element-{allowed,disallowed}-list end positions and message #6270

Merged
merged 1 commit into from Aug 17, 2022
Merged

Fix selector-pseudo-element-{allowed,disallowed}-list end positions and message #6270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 deletions lib/rules/selector-pseudo-element-allowed-list/__tests__/index.js
View file
Open in desktop
Expand Up @@ -36,33 +36,43 @@ testRule({
reject: [
{
code: 'a::BEFORE {}',
message: messages.rejected('BEFORE'),
message: messages.rejected('::BEFORE'),
line: 1,
column: 2,
endLine: 1,
endColumn: 10,
},
{
code: 'a::after {}',
message: messages.rejected('after'),
message: messages.rejected('::after'),
line: 1,
column: 2,
endLine: 1,
endColumn: 9,
},
{
code: 'a::AFTER {}',
message: messages.rejected('AFTER'),
message: messages.rejected('::AFTER'),
line: 1,
column: 2,
endLine: 1,
endColumn: 9,
},
{
code: 'a,\nb::after {}',
message: messages.rejected('after'),
message: messages.rejected('::after'),
line: 2,
column: 2,
endLine: 2,
endColumn: 9,
},
{
code: 'a::not-my-pseudo-element {}',
message: messages.rejected('not-my-pseudo-element'),
message: messages.rejected('::not-my-pseudo-element'),
line: 1,
column: 2,
endLine: 1,
endColumn: 25,
},
],
});
Expand All @@ -82,13 +92,13 @@ testRule({
reject: [
{
code: 'a::after {}',
message: messages.rejected('after'),
message: messages.rejected('::after'),
line: 1,
column: 2,
},
{
code: 'a::not-before {}',
message: messages.rejected('not-before'),
message: messages.rejected('::not-before'),
line: 1,
column: 2,
},
Expand All @@ -114,7 +124,7 @@ testRule({
reject: [
{
code: 'a::after {}',
message: messages.rejected('after'),
message: messages.rejected('::after'),
line: 1,
column: 2,
},
Expand Down
5 changes: 3 additions & 2 deletions lib/rules/selector-pseudo-element-allowed-list/index.js
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ const rule = (primary) => {
const value = pseudoNode.value;

// Ignore pseudo-classes
if (value[1] !== ':') {
if (value.charAt(1) !== ':') {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[note] I think the charAt() method is more readable since we can easily see that its method receiver is a string.

return;
}

Expand All @@ -59,8 +59,9 @@ const rule = (primary) => {

report({
index: pseudoNode.sourceIndex,
message: messages.rejected(name),
message: messages.rejected(value),
node: ruleNode,
word: value,
result,
ruleName,
});
Expand Down
28 changes: 21 additions & 7 deletions lib/rules/selector-pseudo-element-disallowed-list/__tests__/index.js
View file
Open in desktop
Expand Up @@ -39,45 +39,59 @@ testRule({
reject: [
{
code: 'a::before {}',
message: messages.rejected('before'),
message: messages.rejected('::before'),
line: 1,
column: 2,
endLine: 1,
endColumn: 10,
},
{
code: 'a,\nb::before {}',
message: messages.rejected('before'),
message: messages.rejected('::before'),
line: 2,
column: 2,
endLine: 2,
endColumn: 10,
},
{
code: '::selection {}',
message: messages.rejected('selection'),
message: messages.rejected('::selection'),
line: 1,
column: 1,
endLine: 1,
endColumn: 12,
},
{
code: '::-webkit-selection {}',
message: messages.rejected('-webkit-selection'),
message: messages.rejected('::-webkit-selection'),
line: 1,
column: 1,
endLine: 1,
endColumn: 20,
},
{
code: 'a:not(::selection) {}',
message: messages.rejected('selection'),
message: messages.rejected('::selection'),
line: 1,
column: 7,
endLine: 1,
endColumn: 18,
},
{
code: 'a::my-pseudo-element {}',
message: messages.rejected('my-pseudo-element'),
message: messages.rejected('::my-pseudo-element'),
line: 1,
column: 2,
endLine: 1,
endColumn: 21,
},
{
code: 'a::MY-OTHER-pseudo-element {}',
message: messages.rejected('MY-OTHER-pseudo-element'),
message: messages.rejected('::MY-OTHER-pseudo-element'),
line: 1,
column: 2,
endLine: 1,
endColumn: 27,
},
],
});
Expand Down
5 changes: 3 additions & 2 deletions lib/rules/selector-pseudo-element-disallowed-list/index.js
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ const rule = (primary) => {
const value = pseudoNode.value;

// Ignore pseudo-classes
if (value[1] !== ':') {
if (value.charAt(1) !== ':') {
return;
}

Expand All @@ -59,8 +59,9 @@ const rule = (primary) => {

report({
index: pseudoNode.sourceIndex,
message: messages.rejected(name),
message: messages.rejected(value),
node: ruleNode,
word: value,
result,
ruleName,
});
Expand Down