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.
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
Handle interpolation in selector-nest-combinators #307
Merged
kristerkari
merged 3 commits into
master
from
bugfix/selector-nest-combinators-interpolation
Feb 2, 2019
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
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 |
---|---|---|
|
@@ -4,9 +4,10 @@ import { namespace, parseSelector } from "../../utils"; | |
export const ruleName = namespace("selector-nest-combinators"); | ||
|
||
export const messages = utils.ruleMessages(ruleName, { | ||
expectedInterpolation: `Expected interpolation to be in a nested form`, | ||
expected: (combinator, type) => | ||
`Expected combinator "${combinator}" of type "${type}" to be in a nested form`, | ||
rejected: () => `Unexpected nesting found in selector` | ||
rejected: `Unexpected nesting found in selector` | ||
}); | ||
|
||
export default function(expectation) { | ||
|
@@ -20,21 +21,39 @@ export default function(expectation) { | |
return; | ||
} | ||
|
||
function precedesParentSelector(current) { | ||
do { | ||
current = current.next(); | ||
|
||
if (current.type === "nesting") { | ||
return true; | ||
} | ||
} while (current.next()); | ||
|
||
return false; | ||
} | ||
|
||
// attribute, class, combinator, comment, id, nesting, pseudo, root, selector, string, tag, or universal | ||
const chainingTypes = [ | ||
"attribute", | ||
"class", | ||
"id", | ||
"pseudo", | ||
"tag", | ||
"universal" | ||
]; | ||
|
||
const interpolationRe = /#{.+?}$/; | ||
|
||
root.walkRules(rule => { | ||
parseSelector(rule.selector, result, rule, fullSelector => { | ||
// attribute, class, combinator, comment, id, nesting, pseudo, root, selector, string, tag, or universal | ||
const chainingTypes = [ | ||
"attribute", | ||
"class", | ||
"id", | ||
"pseudo", | ||
"tag", | ||
"universal" | ||
]; | ||
|
||
let message; | ||
|
||
fullSelector.walk(node => { | ||
if (node.value === "}") { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I added this because the selector parser can not properly parse interpolation, so the |
||
return; | ||
} | ||
|
||
if (expectation === "always") { | ||
if (node.type === "selector") { | ||
return; | ||
|
@@ -81,7 +100,17 @@ export default function(expectation) { | |
return; | ||
} | ||
|
||
message = messages.expected(node.value, node.type); | ||
const hasInterpolation = interpolationRe.test(rule.selector); | ||
|
||
if (node.type !== "combinator" && hasInterpolation) { | ||
return; | ||
} | ||
|
||
if (hasInterpolation) { | ||
message = messages.expectedInterpolation; | ||
} else { | ||
message = messages.expected(node.value, node.type); | ||
} | ||
} | ||
|
||
if (expectation === "never") { | ||
|
@@ -99,18 +128,6 @@ export default function(expectation) { | |
message, | ||
index: node.sourceIndex | ||
}); | ||
|
||
function precedesParentSelector(current) { | ||
do { | ||
current = current.next(); | ||
|
||
if (current.type === "nesting") { | ||
return true; | ||
} | ||
} while (current.next()); | ||
|
||
return false; | ||
} | ||
}); | ||
}); | ||
}); | ||
|
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.
I move these things on top, so that they're not inside a loop