Fix cache corruption in incremental resolver

pkg/analyzer/lib/src/generated/incremental_resolution_validator.dart

 // Copyright (c) 2014, 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.
 
 library analyzer.src.generated.incremental_resolution_validator;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ skipping 10 matching lines @@
   actual.accept(validator);
 }
 
 /**
  * This exception is thrown when a mismatch between actual and expected AST
  * or resolution is found.
  */
 class IncrementalResolutionMismatch {
   final String message;
   IncrementalResolutionMismatch(this.message);
+
+  @override
+  String toString() => "IncrementalResolutionMismatch: $message";
 }
 
 class _SameResolutionValidator implements AstVisitor {
   final bool validateTypes;
-  AstNode other;
+  AstNode other; // expected

[Brian Wilkerson, 2016/02/16 15:10:48]

nit: the comment should be a dartdoc

[skybrian, 2016/02/17 01:23:41]

Done. (Actually the variable should be renamed, but I won't do that now.)

 
   _SameResolutionValidator(this.validateTypes, this.other);
 
   @override
   visitAdjacentStrings(AdjacentStrings node) {}
 
   @override
   visitAnnotation(Annotation node) {
     Annotation other = this.other;
     _visitNode(node.name, other.name);
@@ skipping 834 matching lines @@
 
   void _visitExpression(Expression a, Expression b) {
 //    print('[${a.offset}] |$a| vs. [${b.offset}] |$b|');
     _verifyType(a.staticType, b.staticType);
     _verifyType(a.propagatedType, b.propagatedType);
     _verifyElement(a.staticParameterElement, b.staticParameterElement);
     _verifyElement(a.propagatedParameterElement, b.propagatedParameterElement);
     _assertNode(a, b);
   }
 
-  void _visitList(NodeList nodeList, NodeList otherList) {
+  void _visitList(NodeList nodeList, NodeList expected) {
     int length = nodeList.length;
-    _expectLength(otherList, length);
+    _expectLength(nodeList, expected.length);
     for (int i = 0; i < length; i++) {
-      _visitNode(nodeList[i], otherList[i]);
+      _visitNode(nodeList[i], expected[i]);
     }
   }
 
   void _visitNode(AstNode node, AstNode other) {
     if (node == null) {
       _expectIsNull(other);
     } else {
       this.other = other;
       _assertNode(node, other);
       node.accept(this);
@@ skipping 47 matching lines @@
    *     package:project/my_lib.dart      -> my_lib.dart
    */
   static String _getShortElementLocationUri(String uri) {
     int index = uri.lastIndexOf('/');
     if (index == -1) {
       return uri;
     }
     return uri.substring(index + 1);
   }
 }