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.

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

Properly support selector lists for selector.extend() #1378

Merged
merged 1 commit into from Jun 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -13,6 +13,9 @@
URLs (those that begin with `/`) in `@import` rules would be passed to
both Dart and JS importers as `file:` URLs.

* Properly support selector lists for the `$extendee` argument to
`selector.extend()` and `selector.replace()`.

* Fix an edge case where `@extend` wouldn't affect a selector within a
pseudo-selector such as `:is()` that itself extended other selectors.

Expand Down
29 changes: 13 additions & 16 deletions lib/src/extend/extension_store.dart
Expand Up @@ -95,28 +95,25 @@ class ExtensionStore {
SelectorList targets,
ExtendMode mode,
FileSpan span) {
var compoundTargets = [
for (var complex in targets.components)
if (complex.components.length != 1)
throw SassScriptException("Can't extend complex selector $complex.")
else
complex.components.first as CompoundSelector
];

var extensions = {
for (var compound in compoundTargets)
var extender = ExtensionStore._mode(mode);
if (!selector.isInvisible) {
extender._originals.addAll(selector.components);
}

for (var complex in targets.components) {
if (complex.components.length != 1) {
throw SassScriptException("Can't extend complex selector $complex.");
}
var compound = complex.components.first as CompoundSelector;

selector = extender._extendList(selector, span, {
for (var simple in compound.components)
simple: {
for (var complex in source.components)
complex: Extension(complex, span, simple, span, optional: true)
}
};

var extender = ExtensionStore._mode(mode);
if (!selector.isInvisible) {
extender._originals.addAll(selector.components);
});
}
selector = extender._extendList(selector, span, extensions);

return selector;
}
Expand Down