Discard previous overlay content on _sourceChanged() notification.

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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine;
 
 import "dart:math" as math;
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/src/cancelable_future.dart';
 import 'package:analyzer/src/generated/incremental_resolution_validator.dart';
 import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/task/task_dart.dart';
-import 'package:analyzer/src/util/lru_map.dart';
 
 import '../../instrumentation/instrumentation.dart';
 import 'ast.dart';
 import 'constant.dart';
 import 'element.dart';
 import 'error.dart';
 import 'error_verifier.dart';
 import 'html.dart' as ht;
 import 'incremental_resolver.dart' show IncrementalResolver,
     PoorMansIncrementalResolver;
@@ skipping 935 matching lines @@
    * A flag indicating whether this context is disposed.
    */
   bool _disposed = false;
 
   /**
    * A cache of content used to override the default content of a source.
    */
   ContentCache _contentCache = new ContentCache();
 
   /**
-   * A cache of content used to override the default content of a source
-   * before the corresponding override was removed from [_contentCache].
-   */
-  LRUMap<Source, String> _prevOverlayCache = new LRUMap<Source, String>(5);
-
-  /**
    * The source factory used to create the sources that can be analyzed in this context.
    */
   SourceFactory _sourceFactory;
 
   /**
    * The set of declared variables used when computing constant values.
    */
   DeclaredVariables _declaredVariables = new DeclaredVariables();
 
   /**
@@ skipping 1249 matching lines @@
     } else if (originalContents != null) {
       _incrementalAnalysisCache =
           IncrementalAnalysisCache.clear(_incrementalAnalysisCache, source);
       changed = newContents != originalContents;
       // We are removing the overlay for the file, check if the file's
       // contents is the same as it was in the overlay.
       try {
         TimestampedData<String> fileContents = getContents(source);
         String fileContentsData = fileContents.data;
         if (fileContentsData == originalContents) {
-          _prevOverlayCache.put(source, fileContentsData);
+          sourceEntry.setValue(SourceEntry.CONTENT, fileContentsData);
           sourceEntry.modificationTime = fileContents.modificationTime;
           changed = false;
         }
       } catch (e) {
       }
       // If not the same content (e.g. the file is being closed without save),
       // then force analysis.
       if (changed) {
         _sourceChanged(source);
       }
@@ skipping 2752 matching lines @@
    * <b>Note:</b> This method must only be invoked while we are synchronized on
    * [cacheLock].
    */
   void _sourceChanged(Source source) {
     SourceEntry sourceEntry = _cache.get(source);
     // If the source is removed, we don't care about it.
     if (sourceEntry == null) {
       return;
     }
     // Check if the content of the source is the same as it was the last time.
-    String sourceContent = _prevOverlayCache.get(source);
+    String sourceContent = sourceEntry.getValue(SourceEntry.CONTENT);
     if (sourceContent != null) {
+      sourceEntry.setState(SourceEntry.CONTENT, CacheState.FLUSHED);
       try {
         TimestampedData<String> fileContents = getContents(source);
         if (fileContents.data == sourceContent) {
           return;
         }
       } catch (e) {
       }
     }
     // We have to invalidate the cache.
     _propagateInvalidation(source, sourceEntry);
@@ skipping 7465 matching lines @@
     if (element.id == _id) {
       result = element;
       throw new _ElementByIdFinderException();
     }
     super.visitElement(element);
   }
 }
 
 class _ElementByIdFinderException {
 }