Don't report removed sources as changed in CacheConsistencyValidatorImpl.

pkg/analyzer/lib/src/generated/engine.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.engine;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 1173 matching lines @@
 
   static const int ENABLE_ASSERT_FLAG = 0x01;
   static const int ENABLE_ASYNC_FLAG = 0x02;
   static const int ENABLE_GENERIC_METHODS_FLAG = 0x04;
   static const int ENABLE_STRICT_CALL_CHECKS_FLAG = 0x08;
   static const int ENABLE_STRONG_MODE_FLAG = 0x10;
   static const int ENABLE_STRONG_MODE_HINTS_FLAG = 0x20;
   static const int ENABLE_SUPER_MIXINS_FLAG = 0x40;
 
   /**
+   * The default list of non-nullable type names.
+   */
+  static const List<String> NONNULLABLE_TYPES = const <String>[];
+
+  /**
    * A predicate indicating whether analysis is to parse and analyze function
    * bodies.
    */
   AnalyzeFunctionBodiesPredicate _analyzeFunctionBodiesPredicate =
       _analyzeAllFunctionBodies;
 
   /**
    * The maximum number of sources for which AST structures should be kept in
    * the cache.
    */
@@ skipping 123 matching lines @@
    * This flag can be used without necessarily enabling [strongMode], but it is
    * designed with strong mode's type inference in mind. Without type inference,
    * it will raise many errors. Also it does not provide type safety without
    * strong mode.
    *
    * This option is experimental and subject to change.
    */
   bool implicitDynamic = true;
 
   /**
-   * The default list of non-nullable type names.
-   */
-  static const List<String> NONNULLABLE_TYPES = const <String>[];
-
-  /**
    * Initialize a newly created set of analysis options to have their default
    * values.
    */
   AnalysisOptionsImpl();
 
   /**
    * Initialize a newly created set of analysis options to have the same values
    * as those in the given set of analysis [options].
    */
   AnalysisOptionsImpl.from(AnalysisOptions options) {
@@ skipping 201 matching lines @@
   final bool hasChanges;
 
   ApplyChangesStatus(this.hasChanges);
 }
 
 /**
  * Statistics about cache consistency validation.
  */
 class CacheConsistencyValidationStatistics {
   /**
-   * Number of sources which were modified, but the context was not notified
+   * Number of sources which were changed, but the context was not notified
    * about it, so this fact was detected only during cache consistency
    * validation.
    */
-  int numOfModified = 0;
+  int numOfChanged = 0;
 
   /**
-   * Number of sources which were deleted, but the context was not notified
+   * Number of sources which stopped existing, but the context was not notified
    * about it, so this fact was detected only during cache consistency
    * validation.
    */
-  int numOfDeleted = 0;
+  int numOfRemoved = 0;
+
+  /**
+   * Reset all counters.
+   */
+  void reset() {
+    numOfChanged = 0;
+    numOfRemoved = 0;
+  }
 }
 
 /**
  * Interface for cache consistency validation in an [InternalAnalysisContext].
  */
 abstract class CacheConsistencyValidator {
   /**
    * Return sources for which the contexts needs to know modification times.
    */
   List<Source> getSourcesToComputeModificationTimes();
@@ skipping 1139 matching lines @@
    * The data that was created from the source.
    */
   final E data;
 
   /**
    * Initialize a newly created holder to associate the given [data] with the
    * given [modificationTime].
    */
   TimestampedData(this.modificationTime, this.data);
 }