@@ -452,8 +452,10 @@ class _MediaRulesReplacer extends Visitor {
452452/// Expand all @include at the top-level the ruleset(s) associated with the
453453/// mixin.
454454class TopLevelIncludes extends Visitor {
455+ static const int _maxExpansions = 256 ;
455456 StyleSheet ? _styleSheet;
456457 final Messages _messages;
458+ int _expansions = 0 ;
457459
458460 /// Map of variable name key to it's definition.
459461 final map = < String , MixinDefinition > {};
@@ -487,7 +489,12 @@ class TopLevelIncludes extends Visitor {
487489 } else if (map.containsKey (node.name)) {
488490 var mixinDef = map[node.name];
489491 if (mixinDef is MixinRulesetDirective ) {
490- _TopLevelIncludeReplacer .replace (_styleSheet! , node, mixinDef.rulesets);
492+ _TopLevelIncludeReplacer .replace (
493+ _styleSheet! ,
494+ node,
495+ _expansions++ < _maxExpansions
496+ ? mixinDef.rulesets
497+ : const < TreeNode > []);
491498 } else if (currDef is MixinRulesetDirective && _anyRulesets (currDef)) {
492499 final mixinRuleset = currDef;
493500 var index = mixinRuleset.rulesets.indexOf (node);
@@ -538,7 +545,6 @@ class TopLevelIncludes extends Visitor {
538545
539546/// @include as a top-level with ruleset(s).
540547class _TopLevelIncludeReplacer extends Visitor {
541- static const int _maxExpansions = 256 ;
542548 final IncludeDirective _include;
543549 final List <TreeNode > _newRules;
544550
@@ -556,9 +562,7 @@ class _TopLevelIncludeReplacer extends Visitor {
556562 void visitStyleSheet (StyleSheet node) {
557563 var index = node.topLevels.indexOf (_include);
558564 if (index != - 1 ) {
559- if (node.topLevels.length < _maxExpansions) {
560- node.topLevels.insertAll (index + 1 , _newRules);
561- }
565+ node.topLevels.insertAll (index + 1 , _newRules);
562566 node.topLevels.replaceRange (index, index + 1 , [NoOp ()]);
563567 }
564568 super .visitStyleSheet (node);
@@ -568,9 +572,7 @@ class _TopLevelIncludeReplacer extends Visitor {
568572 void visitMixinRulesetDirective (MixinRulesetDirective node) {
569573 var index = node.rulesets.indexOf (_include);
570574 if (index != - 1 ) {
571- if (node.rulesets.length < _maxExpansions) {
572- node.rulesets.insertAll (index + 1 , _newRules);
573- }
575+ node.rulesets.insertAll (index + 1 , _newRules);
574576 // Only the resolve the @include once.
575577 node.rulesets.replaceRange (index, index + 1 , [NoOp ()]);
576578 }
@@ -734,8 +736,10 @@ class CallMixin extends Visitor {
734736
735737/// Expand all @include inside of a declaration associated with a mixin.
736738class DeclarationIncludes extends Visitor {
739+ static const int _maxExpansions = 256 ;
737740 StyleSheet ? _styleSheet;
738741 final Messages _messages;
742+ int _expansions = 0 ;
739743
740744 /// Map of variable name key to it's definition.
741745 final Map <String , MixinDefinition > map = < String , MixinDefinition > {};
@@ -804,7 +808,12 @@ class DeclarationIncludes extends Visitor {
804808 rulesets.add (IncludeMixinAtDeclaration (
805809 ruleset as IncludeDirective , ruleset.span));
806810 }
807- _IncludeReplacer .replace (_styleSheet! , node, rulesets);
811+ _IncludeReplacer .replace (
812+ _styleSheet! ,
813+ node,
814+ _expansions++ < _maxExpansions
815+ ? rulesets
816+ : const < Declaration > []);
808817 }
809818 }
810819 }
@@ -816,7 +825,11 @@ class DeclarationIncludes extends Visitor {
816825
817826 if (mixinDef is MixinDeclarationDirective ) {
818827 _IncludeReplacer .replace (
819- _styleSheet! , node, mixinDef.declarations.declarations);
828+ _styleSheet! ,
829+ node,
830+ _expansions++ < _maxExpansions
831+ ? mixinDef.declarations.declarations
832+ : const < TreeNode > []);
820833 }
821834 } else {
822835 _messages.warning ('Undefined mixin ${node .include .name }' , node.span);
@@ -832,7 +845,11 @@ class DeclarationIncludes extends Visitor {
832845 if (currDef is MixinDeclarationDirective &&
833846 mixinDef is MixinDeclarationDirective ) {
834847 _IncludeReplacer .replace (
835- _styleSheet! , node, mixinDef.declarations.declarations);
848+ _styleSheet! ,
849+ node,
850+ _expansions++ < _maxExpansions
851+ ? mixinDef.declarations.declarations
852+ : const < TreeNode > []);
836853 } else if (currDef is MixinDeclarationDirective ) {
837854 var decls =
838855 (currDef as MixinDeclarationDirective ).declarations.declarations;
@@ -889,7 +906,6 @@ class DeclarationIncludes extends Visitor {
889906
890907/// @include as a top-level with ruleset(s).
891908class _IncludeReplacer extends Visitor {
892- static const int _maxExpansions = 256 ;
893909 final TreeNode _include;
894910 final List <TreeNode > _newDeclarations;
895911
@@ -907,9 +923,7 @@ class _IncludeReplacer extends Visitor {
907923 void visitDeclarationGroup (DeclarationGroup node) {
908924 var index = _findInclude (node.declarations, _include);
909925 if (index != - 1 ) {
910- if (node.declarations.length < _maxExpansions) {
911- node.declarations.insertAll (index + 1 , _newDeclarations);
912- }
926+ node.declarations.insertAll (index + 1 , _newDeclarations);
913927 // Change @include to NoOp so it's processed only once.
914928 node.declarations.replaceRange (index, index + 1 , [NoOp ()]);
915929 }
@@ -956,7 +970,7 @@ class AllExtends extends Visitor {
956970
957971 SelectorGroup ? _currSelectorGroup;
958972 int ? _currDeclIndex;
959- final _extendsToRemove = < int > [];
973+ List < int > _extendsToRemove = < int > [];
960974
961975 @override
962976 void visitRuleSet (RuleSet node) {
@@ -993,6 +1007,8 @@ class AllExtends extends Visitor {
9931007 @override
9941008 void visitDeclarationGroup (DeclarationGroup node) {
9951009 var oldDeclIndex = _currDeclIndex;
1010+ var oldExtendsToRemove = _extendsToRemove;
1011+ _extendsToRemove = < int > [];
9961012
9971013 var decls = node.declarations;
9981014 for (_currDeclIndex = 0 ;
@@ -1009,6 +1025,7 @@ class AllExtends extends Visitor {
10091025 _extendsToRemove.clear ();
10101026 }
10111027
1028+ _extendsToRemove = oldExtendsToRemove;
10121029 _currDeclIndex = oldDeclIndex;
10131030 }
10141031}
@@ -1018,14 +1035,16 @@ class AllExtends extends Visitor {
10181035// TODO(terry): Need to handle !optional glag.
10191036/// Changes any selector that matches @extend.
10201037class InheritExtends extends Visitor {
1038+ static const int _maxExpansions = 256 ;
10211039 final AllExtends _allExtends;
10221040
10231041 InheritExtends (Messages messages, this ._allExtends);
10241042
10251043 @override
10261044 void visitSelectorGroup (SelectorGroup node) {
1045+ var expansions = 0 ;
10271046 for (var selectorsIndex = 0 ;
1028- selectorsIndex < node.selectors.length && node.selectors.length < 64 ;
1047+ selectorsIndex < node.selectors.length && expansions < _maxExpansions ;
10291048 selectorsIndex++ ) {
10301049 var selectors = node.selectors[selectorsIndex];
10311050 var isLastNone = false ;
@@ -1040,6 +1059,8 @@ class InheritExtends extends Visitor {
10401059 if (matches != null ) {
10411060 for (var match in matches) {
10421061 if (match == node || match.selectors.isEmpty) continue ;
1062+ if (expansions >= _maxExpansions) break ;
1063+ expansions++ ;
10431064 // Create a new group.
10441065 var newSelectors = selectors.clone ();
10451066 var newSeq = match.selectors[0 ].clone ();
0 commit comments