Cache results for priority files in AnalysisDriver.

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 314 matching lines @@
   nd.PerformanceLog _analysisPerformanceLogger;
   ByteStore byteStore;
   nd.AnalysisDriverScheduler analysisDriverScheduler;
 
   /**
    * The set of the files that are currently priority.
    */
   final Set<String> priorityFiles = new Set<String>();
 
   /**
-   * The cached results for [priorityFiles].
-   * These results must have not `null` units.
-   */
-  final Map<String, nd.AnalysisResult> priorityFileResults = {};
-
-  /**
    * Initialize a newly created server to receive requests from and send
    * responses to the given [channel].
    *
    * If [rethrowExceptions] is true, then any exceptions thrown by analysis are
    * propagated up the call stack.  The default is true to allow analysis
    * exceptions to show up in unit tests, but it should be set to false when
    * running a full analysis server.
    */
   AnalysisServer(
       this.channel,
@@ skipping 272 matching lines @@
     }
     return null;
   }
 
   /**
    * Return the analysis result for the file with the given [path]. The file is
    * analyzed in one of the analysis drivers to which the file was added,
    * otherwise in the first driver, otherwise `null` is returned.
    */
   Future<nd.AnalysisResult> getAnalysisResult(String path) async {
-    nd.AnalysisResult result = priorityFileResults[path];
-    if (result != null) {
-      return result;
-    }
     try {
       nd.AnalysisDriver driver = getAnalysisDriver(path);
       return await driver?.getResult(path);
     } catch (e) {
       // Ignore the exception.
       // We don't want to log the same exception again and again.
       return null;
     }
   }
 
@@ skipping 679 matching lines @@
       prevAnalyzedFiles = null;
     }
     generalAnalysisServices = newServices;
   }
 
   /**
    * Set the priority files to the given [files].
    */
   void setPriorityFiles(String requestId, List<String> files) {
     if (options.enableNewAnalysisDriver) {
-      // Flush results for files that are not priority anymore.
-      priorityFiles
-          .difference(files.toSet())
-          .forEach(priorityFileResults.remove);
       priorityFiles.clear();
       priorityFiles.addAll(files);
       // Set priority files in drivers.
       driverMap.values.forEach((driver) {
         driver.priorityFiles = files;
       });
       return;
     }
     // Note: when a file is a priority file, that information needs to be
     // propagated to all contexts that analyze the file, so that all contexts
@@ skipping 109 matching lines @@
       operation.perform(this);
     }
   }
 
   /**
    * Implementation for `analysis.updateContent`.
    */
   void updateContent(String id, Map<String, dynamic> changes) {
     if (options.enableNewAnalysisDriver) {
       changes.forEach((file, change) {
-        priorityFileResults.remove(file);
-
         // Prepare the new contents.
         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,
@@ skipping 358 matching lines @@
         resourceProvider,
         analysisServer.byteStore,
         analysisServer.fileContentOverlay,
         sourceFactory,
         analysisOptions);
     analysisDriver.name = folder.shortName;
     analysisDriver.status.listen((status) {
       // TODO(scheglov) send server status
     });
     analysisDriver.results.listen((result) {
-      if (analysisServer.priorityFiles.contains(result.path) &&
-          result.unit != null) {
-        analysisServer.priorityFileResults[result.path] = result;
-      }
       new_sendErrorNotification(analysisServer, result);
       String path = result.path;
       CompilationUnit unit = result.unit;
       if (unit != null) {
         if (analysisServer._hasAnalysisServiceSubscription(
             AnalysisService.HIGHLIGHTS, path)) {
           _runDelayed(() {
             sendAnalysisNotificationHighlights(analysisServer, path, unit);
           });
         }
@@ skipping 129 matching lines @@
     // This method is mostly for tests.
     // Context managers manage folders and contexts themselves.
   }
 
   @override
   void removeContext(Folder folder, List<String> flushedFiles) {
     if (analysisServer.options.enableNewAnalysisDriver) {
       sendAnalysisNotificationFlushResults(analysisServer, flushedFiles);
       nd.AnalysisDriver driver = analysisServer.driverMap.remove(folder);
       driver.dispose();
-      // Remove cached priority results for the driver.
-      var results = analysisServer.priorityFileResults;
-      results.keys
-          .where((key) => results[key].driver == driver)
-          .forEach(results.remove);
     } else {
       AnalysisContext context = analysisServer.folderMap.remove(folder);
       sendAnalysisNotificationFlushResults(analysisServer, flushedFiles);
 
       analysisServer.operationQueue.contextRemoved(context);
       analysisServer._onContextsChangedController
           .add(new ContextsChangedEvent(removed: [context]));
       analysisServer.sendContextAnalysisDoneNotifications(
           context, AnalysisDoneReason.CONTEXT_REMOVED);
       context.dispose();
@@ skipping 121 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');
 }