Skip to content

Commit

Permalink
Fix selector-nest-combinators end positions (#921)
Browse files Browse the repository at this point in the history 
This change also fixes duplicate reported lint problems.
  • Loading branch information
@ybiquitous
ybiquitous committed Dec 13, 2023
1 parent a05bcf2 commit 8d9b5e4
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 142 deletions.
189 changes: 58 additions & 131 deletions src/rules/selector-nest-combinators/__tests__/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ testRule({
description: "when a child combinator is used instead of nesting",
message: messages.expected(" ", "combinator"),
line: 2,
column: 11
column: 11,
endLine: 2,
endColumn: 12
},
{
code: `
Expand All @@ -153,7 +155,9 @@ testRule({
description: "when a selector is chained with another",
message: messages.expected("bar", "class"),
line: 2,
column: 11
column: 11,
endLine: 2,
endColumn: 15
},
{
code: `
Expand All @@ -163,7 +167,9 @@ testRule({
"when a direct descendant combinator is used without nesting",
message: messages.expected(">", "combinator"),
line: 2,
column: 12
column: 11,
endLine: 2,
endColumn: 14
},
{
code: `
Expand All @@ -172,7 +178,9 @@ testRule({
description: "when pseudo classes are used without nesting",
message: messages.expected(":hover", "pseudo"),
line: 2,
column: 11
column: 11,
endLine: 2,
endColumn: 17
},
{
code: `
Expand All @@ -181,7 +189,9 @@ testRule({
description: "when universal selectors are used with a combinator",
message: messages.expected("+", "combinator"),
line: 2,
column: 9
column: 8,
endLine: 2,
endColumn: 11
},
{
code: `
Expand All @@ -190,7 +200,9 @@ testRule({
description: "when pseudo selectors only are chained",
message: messages.expected(":last-child", "pseudo"),
line: 2,
column: 25
column: 25,
endLine: 2,
endColumn: 36
},
{
code: `
Expand All @@ -199,7 +211,9 @@ testRule({
description: "when interpolation is used",
message: messages.expectedInterpolation,
line: 2,
column: 18
column: 18,
endLine: 2,
endColumn: 19
}
]
});
Expand Down Expand Up @@ -312,18 +326,11 @@ testRule({
}
`,
description: "when child combinators are nested",
warnings: [
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 9
}
]
message: messages.rejected,
line: 3,
column: 9,
endLine: 3,
endColumn: 13
},
{
code: `
Expand All @@ -332,23 +339,11 @@ testRule({
}
`,
description: "when chained combinators are nested",
warnings: [
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 10
}
]
message: messages.rejected,
line: 3,
column: 9,
endLine: 3,
endColumn: 14
},
{
code: `
Expand All @@ -357,28 +352,11 @@ testRule({
}
`,
description: "when direct descendant combinators are nested",
warnings: [
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 11
},
{
message: messages.rejected,
line: 3,
column: 13
}
]
message: messages.rejected,
line: 3,
column: 9,
endLine: 3,
endColumn: 16
},
{
code: `
Expand All @@ -393,32 +371,16 @@ testRule({
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 10
column: 9,
endLine: 3,
endColumn: 13
},
{
message: messages.rejected,
line: 4,
column: 11
},
{
message: messages.rejected,
line: 4,
column: 11
},
{
message: messages.rejected,
line: 4,
column: 12
column: 11,
endLine: 4,
endColumn: 15
}
]
},
Expand All @@ -435,32 +397,16 @@ testRule({
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 10
},
{
message: messages.rejected,
line: 4,
column: 11
},
{
message: messages.rejected,
line: 4,
column: 11
column: 9,
endLine: 3,
endColumn: 15
},
{
message: messages.rejected,
line: 4,
column: 12
column: 11,
endLine: 4,
endColumn: 17
}
]
},
Expand All @@ -471,23 +417,11 @@ testRule({
}
`,
description: "when pseudo classes are nested",
warnings: [
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 9
},
{
message: messages.rejected,
line: 3,
column: 10
}
]
message: messages.rejected,
line: 3,
column: 9,
endLine: 3,
endColumn: 16
},
{
code: `
Expand All @@ -498,18 +432,11 @@ testRule({
}
`,
description: "when interpolation is used",
warnings: [
{
message: messages.rejected,
line: 3,
column: 8
},
{
message: messages.rejected,
line: 3,
column: 8
}
]
message: messages.rejected,
line: 3,
column: 8,
endLine: 3,
endColumn: 25
}
]
});
31 changes: 20 additions & 11 deletions src/rules/selector-nest-combinators/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ function rule(expectation) {
}

parseSelector(rule.selector, result, rule, fullSelector => {
let message;

fullSelector.walk(node => {
if (node.value === "}") {
return;
Expand Down Expand Up @@ -130,28 +128,39 @@ function rule(expectation) {
return;
}

let message;
if (hasInterpolation) {
message = messages.expectedInterpolation;
} else {
message = messages.expected(node.value, node.type);
}

utils.report({
ruleName,
result,
node: rule,
message,
word: node.toString()
});
return;
}

if (expectation === "never") {
if (rule.parent.type === "root" || rule.parent.type === "atrule") {
return;
}

message = messages.rejected;
}
if (node.type !== "selector") return;

utils.report({
ruleName,
result,
node: rule,
message,
index: node.sourceIndex
});
utils.report({
ruleName,
result,
node: rule,
message: messages.rejected,
word: node.toString()
});
return;
}
});
});
});
Expand Down

0 comments on commit 8d9b5e4

Please sign in to comment.