pkg/csslib: fixed analysis error, more cleanup

pkg/csslib/lib/src/analyzer.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of csslib.parser;
 
 
 // TODO(terry): Add optimizing phase to remove duplicated selectors in the same
 //              selector group (e.g., .btn, .btn { color: red; }).  Also, look
 //              at simplifying selectors expressions too (much harder).
@@ skipping 555 matching lines @@
     index++;
   }
   return -1;
 }
 
 /**
  * Stamp out a mixin with the defined args substituted with the user's
  * parameters.
  */
 class CallMixin extends Visitor {
-  var mixinDef;
+  final MixinDefinition mixinDef;
   List _definedArgs;
   Expressions _currExpressions;
   int _currIndex = -1;
 
   final varUsages = new Map<String, Map<Expressions, Set<int>>>();
 
   /** Only var defs with more than one expression (comma separated). */
   final Map<String, VarDefinition> varDefs;
 
   CallMixin(this.mixinDef, [this.varDefs]) {
     if (mixinDef is MixinRulesetDirective) {
       visitMixinRulesetDirective(mixinDef);
     } else {
       visitMixinDeclarationDirective(mixinDef);
     }
   }
 
   /**
    * Given a mixin's defined arguments return a cloned mixin defintion that has
    * replaced all defined arguments with user's supplied VarUsages.
    */
-  transform(List<TreeNode> callArgs) {
+  MixinDefinition transform(List<TreeNode> callArgs) {
     // TODO(terry): Handle default arguments and varArgs.
     // Transform mixin with callArgs.
     var index = 0;
     for (var index = 0; index < _definedArgs.length; index++) {
       var definedArg = _definedArgs[index];
       VarDefinition varDef;
       if (definedArg is VarDefinition) {
         varDef = definedArg;
       } else if (definedArg is VarDefinitionDirective) {
         VarDefinitionDirective varDirective = definedArg;
         varDef = varDirective.def;
       }
       var callArg = callArgs[index];
 
       // Is callArg a var definition with multi-args (expressions > 1).
       var defArgs = _varDefsAsCallArgs(callArg);
       if (defArgs.isNotEmpty) {
         // Replace call args with the var def parameters.
         callArgs.insertAll(index, defArgs);
         callArgs.removeAt(index + defArgs.length);
         callArg = callArgs[index];
       }
 
       var expressions = varUsages[varDef.definedName];
-      var expressionsLength = expressions.length;
       expressions.forEach((k, v) {
         for (var usagesIndex in v) {
           k.expressions.replaceRange(usagesIndex, usagesIndex + 1, callArg);
         }
       });
     }
 
     // Clone the mixin
     return mixinDef.clone();
   }
@@ skipping 83 matching lines @@
 
   DeclarationIncludes(this._messages, List<StyleSheet> styleSheets) {
     for (var styleSheet in styleSheets) {
       visitTree(styleSheet);
     }
   }
 
   bool _allIncludes(rulesets) =>
       rulesets.every((rule) => rule is IncludeDirective || rule is NoOp);
 
-  CallMixin _createCallDeclMixin(mixinDef) {
+  CallMixin _createCallDeclMixin(MixinDefinition mixinDef) {
     callMap.putIfAbsent(mixinDef.name, () =>
         callMap[mixinDef.name] = new CallMixin(mixinDef, varDefs));
     return callMap[mixinDef.name];
   }
 
   void visitStyleSheet(StyleSheet ss) {
     _styleSheet = ss;
     super.visitStyleSheet(ss);
     _styleSheet = null;
   }
@@ skipping 223 matching lines @@
   }
 }
 
 // TODO(terry): Need to handle merging selector sequences
 // TODO(terry): Need to handle @extend-Only selectors.
 // TODO(terry): Need to handle !optional glag.
 /**
  * Changes any selector that matches @extend.
  */
 class InheritExtends extends Visitor {
-  Messages _messages;
-  AllExtends _allExtends;
+  final Messages _messages;
+  final AllExtends _allExtends;
 
   InheritExtends(this._messages, this._allExtends);
 
   void visitSelectorGroup(SelectorGroup node) {
     for (var selectorsIndex = 0; selectorsIndex < node.selectors.length;
         selectorsIndex++) {
       var selectors = node.selectors[selectorsIndex];
       var isLastNone = false;
       var selectorName = "";
       for (var index = 0; index < selectors.simpleSelectorSequences.length;
@@ skipping 26 matching lines @@
             isLastNone = false;
           }
         } else {
           isLastNone = simpleSeq.isCombinatorNone;
         }
       }
     }
     super.visitSelectorGroup(node);
   }
 }