Index: packages/csslib/lib/src/analyzer.dart |
diff --git a/packages/csslib/lib/src/analyzer.dart b/packages/csslib/lib/src/analyzer.dart |
index 4fdd833614b68b4fda74d6a89a834b27fd2b5b7d..fc27ceb09834cb954ecc9878513de4f7ab708a01 100644 |
--- a/packages/csslib/lib/src/analyzer.dart |
+++ b/packages/csslib/lib/src/analyzer.dart |
@@ -463,8 +463,8 @@ class TopLevelIncludes extends Visitor { |
} else if (currDef is MixinRulesetDirective && _anyRulesets(currDef)) { |
// currDef is MixinRulesetDirective |
MixinRulesetDirective mixinRuleset = currDef; |
- int index = mixinRuleset.rulesets.indexOf(node as dynamic); |
- mixinRuleset.rulesets.replaceRange(index, index + 1, [new NoOp()]); |
+ int index = mixinRuleset.rulesets.indexOf(node); |
+ mixinRuleset.rulesets.removeAt(index); |
_messages.warning( |
'Using declaration mixin ${node.name} as top-level mixin', |
node.span); |
@@ -472,13 +472,12 @@ class TopLevelIncludes extends Visitor { |
} else { |
if (currDef is MixinRulesetDirective) { |
MixinRulesetDirective rulesetDirect = currDef as MixinRulesetDirective; |
- var index = 0; |
- rulesetDirect.rulesets.forEach((entry) { |
+ rulesetDirect.rulesets.removeWhere((entry) { |
if (entry == node) { |
- rulesetDirect.rulesets.replaceRange(index, index + 1, [new NoOp()]); |
_messages.warning('Undefined mixin ${node.name}', node.span); |
+ return true; |
} |
- index++; |
+ return false; |
}); |
} |
} |