Use FileContentOverlay instead of ContentCache in the new driver.

pkg/analysis_server/lib/src/analysis_server.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 analysis.server;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:core';
 import 'dart:io' as io;
@@ skipping 20 matching lines @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/exception/exception.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/plugin/resolver_provider.dart';
 import 'package:analyzer/source/pub_package_map_provider.dart';
 import 'package:analyzer/src/context/builder.dart';
 import 'package:analyzer/src/dart/analysis/byte_store.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart' as nd;
 import 'package:analyzer/src/dart/analysis/file_byte_store.dart';
+import 'package:analyzer/src/dart/analysis/file_state.dart' as nd;
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/utilities_general.dart';
 import 'package:analyzer/src/summary/pub_summary.dart';
 import 'package:analyzer/src/task/dart.dart';
 import 'package:analyzer/src/util/glob.dart';
 import 'package:analyzer/task/dart.dart';
@@ skipping 207 matching lines @@
 
   /**
    * The next time (milliseconds since epoch) after which the analysis server
    * should pause so that pending requests can be fetched by the system.
    */
   // Add 1 sec to prevent delay from impacting short running tests
   int _nextPerformOperationDelayTime =
       new DateTime.now().millisecondsSinceEpoch + 1000;
 
   /**
+   * The content overlay for all analysis drivers.
+   */
+  final nd.FileContentOverlay fileContentOverlay = new nd.FileContentOverlay();
+
+  /**
    * The current state of overlays from the client.  This is used as the
    * content cache for all contexts.
    */
   final ContentCache overlayState = new ContentCache();
 
   /**
    * The plugins that are defined outside the analysis_server package.
    */
   List<Plugin> userDefinedPlugins;
 
@@ skipping 1053 matching lines @@
       operation.perform(this);
     }
   }
 
   /**
    * Implementation for `analysis.updateContent`.
    */
   void updateContent(String id, Map<String, dynamic> changes) {
     if (options.enableNewAnalysisDriver) {
       changes.forEach((file, change) {
-        Source source = resourceProvider.getFile(file).createSource();
         // Prepare the new contents.
-        String oldContents = overlayState.getContents(source);
+        String oldContents = fileContentOverlay[file];
         String newContents;
         if (change is AddContentOverlay) {
           newContents = change.content;
         } else if (change is ChangeContentOverlay) {
           if (oldContents == null) {
             // The client may only send a ChangeContentOverlay if there is
             // already an existing overlay for the source.
             throw new RequestFailure(new Response(id,
                 error: new RequestError(RequestErrorCode.INVALID_OVERLAY_CHANGE,
                     'Invalid overlay change')));
           }
           try {
             newContents = SourceEdit.applySequence(oldContents, change.edits);
           } on RangeError {
             throw new RequestFailure(new Response(id,
                 error: new RequestError(RequestErrorCode.INVALID_OVERLAY_CHANGE,
                     'Invalid overlay change')));
           }
         } else if (change is RemoveContentOverlay) {
           newContents = null;
         } else {
           // Protocol parsing should have ensured that we never get here.
           throw new AnalysisException('Illegal change type');
         }
 
-        overlayState.setContents(source, newContents);
+        fileContentOverlay[file] = newContents;
 
         driverMap.values.forEach((driver) {
           driver.changeFile(file);
         });
         // TODO(scheglov) implement other cases
       });
       return;
     }
     changes.forEach((file, change) {
       ContextSourcePair contextSource = getContextSourcePair(file);
@@ skipping 315 matching lines @@
       ContextBuilder builder = createContextBuilder(folder, options);
       AnalysisContext context = builder.buildContext(folder.path);
       sourceFactory = context.sourceFactory;
       analysisOptions = context.analysisOptions;
       context.dispose();
     }
     nd.AnalysisDriver analysisDriver = new nd.AnalysisDriver(
         new nd.PerformanceLog(io.stdout),
         resourceProvider,
         analysisServer.byteStore,
-        analysisServer.overlayState,
+        analysisServer.fileContentOverlay,
         sourceFactory,
         analysisOptions);
     analysisDriver.name = folder.shortName;
     analysisDriver.status.listen((status) {
       // TODO(scheglov) send server status
     });
     analysisDriver.results.listen((result) {
       new_sendErrorNotification(analysisServer, result);
       CompilationUnit unit = result.unit;
       if (unit != null) {
@@ skipping 222 matching lines @@
   /**
    * The [PerformanceTag] for time spent in server request handlers.
    */
   static PerformanceTag serverRequests = new PerformanceTag('serverRequests');
 
   /**
    * The [PerformanceTag] for time spent in split store microtasks.
    */
   static PerformanceTag splitStore = new PerformanceTag('splitStore');
 }