Fix @extend through mixed @import and @use (#2627)

Closes #2616

Author: nex3

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.91.1-dev
+
+* Fix a bug where `@extend` rules loaded through a mixture of `@import` and
+  `@use` rules could fail to apply correctly.
+
 ## 1.91.0
 
 * **Potentially breaking change:** `meta.inspect()` (as well as other systems

lib/src/extend/extension_store.dart

@@ -1102,12 +1102,18 @@ class ExtensionStore {
     var newMediaContexts = <ModifiableBox<SelectorList>, List<CssMediaQuery>>{};
     var oldToNewSelectors = Map<SelectorList, Box<SelectorList>>.identity();
 
+    // A map from the old to the new selector boxes. This ensures that if a
+    // single box is referenced by multiple simple selectors, we only create a
+    // single new box for it in the cloned structure.
+    var newBoxes = <ModifiableBox<SelectorList>, ModifiableBox<SelectorList>>{};
+
     _selectors.forEach((simple, selectors) {
       var newSelectorSet = <ModifiableBox<SelectorList>>{};
       newSelectors[simple] = newSelectorSet;
 
       for (var selector in selectors) {
-        var newSelector = ModifiableBox(selector.value);
+        var newSelector =
+            newBoxes.putIfAbsent(selector, () => ModifiableBox(selector.value));
         newSelectorSet.add(newSelector);
         oldToNewSelectors[selector.value] = newSelector.seal();
 

lib/src/util/box.dart

@@ -16,6 +16,8 @@ class Box<T> {
   bool operator ==(Object other) => other is Box<T> && other._inner == _inner;
 
   int get hashCode => _inner.hashCode;
+
+  String toString() => "<box: $value>";
 }
 
 /// A mutable reference to a (presumably immutable) value.
@@ -31,4 +33,6 @@ class ModifiableBox<T> {
   ///
   /// The underlying modifiable box may still be modified.
   Box<T> seal() => Box._(this);
+
+  String toString() => "<modifiable box: $value>";
 }

pkg/sass-parser/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.27-dev
+
+* No user-visible changes.
+
 ## 0.4.26
 
 * No user-visible changes.

pkg/sass-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-parser",
-  "version": "0.4.26",
+  "version": "0.4.27-dev",
   "description": "A PostCSS-compatible wrapper of the official Sass parser",
   "repository": "sass/sass",
   "author": "Google Inc.",

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 15.9.1-dev
+
+* No user-visible changes.
+
 ## 15.9.0
 
 * No user-visible changes.

pkg/sass_api/pubspec.yaml

@@ -2,15 +2,15 @@ name: sass_api
 # Note: Every time we add a new Sass AST node, we need to bump the *major*
 # version because it's a breaking change for anyone who's implementing the
 # visitor interface(s).
-version: 15.9.0
+version: 15.9.1-dev
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.6.0 <4.0.0"
 
 dependencies:
-  sass: 1.91.0
+  sass: 1.91.1
 
 dev_dependencies:
   dartdoc: ^8.0.14

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.91.0
+version: 1.91.1-dev
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass