Move folderMap from AnalysisContext to ContextManager

pkg/analysis_server/lib/src/domain_diagnostic.dart

 // Copyright (c) 2015, 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.src.domain_diagnostic;
 
 import 'dart:collection';
 import 'dart:core' hide Resource;
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/analysis_server.dart';
-import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/context/cache.dart';
 import 'package:analyzer/src/context/context.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_collection.dart';
 import 'package:analyzer/src/task/driver.dart';
 import 'package:analyzer/task/model.dart';
 
 int _workItemCount(AnalysisContextImpl context) {
   AnalysisDriver driver = context.driver;
@@ skipping 10 matching lines @@
   /// The analysis server that is using this handler to process requests.
   final AnalysisServer server;
 
   /// Initialize a newly created handler to handle requests for the given
   /// [server].
   DiagnosticDomainHandler(this.server);
 
   /// Answer the `diagnostic.diagnostics` request.
   Response computeDiagnostics(Request request) {
     List<ContextData> infos = <ContextData>[];
-    server.folderMap.forEach((Folder folder, AnalysisContext context) {
-      infos.add(extractData(folder, context));
-    });
+    for (AnalysisContext context in server.analysisContexts) {
+      infos.add(extractData(context));
+    }
+    ;

[scheglov, 2016/02/29 19:03:37]

Remove this line.

[Brian Wilkerson, 2016/02/29 20:45:11]

Done

 
     return new DiagnosticGetDiagnosticsResult(infos).toResponse(request.id);
   }
 
   /// Extract context data from the given [context].
-  ContextData extractData(Folder folder, AnalysisContext context) {
+  ContextData extractData(AnalysisContext context) {
     int explicitFiles = 0;
     int implicitFiles = 0;
     int workItems = 0;
     Set<String> exceptions = new HashSet<String>();
     if (context is AnalysisContextImpl) {
       workItems = _workItemCount(context);
       var cache = context.analysisCache;
       if (cache is AnalysisCache) {
         Set<AnalysisTarget> countedTargets = new HashSet<AnalysisTarget>();
         MapIterator<AnalysisTarget, CacheEntry> iterator = cache.iterator();
@@ skipping 30 matching lines @@
       String requestName = request.method;
       if (requestName == DIAGNOSTICS) {
         return computeDiagnostics(request);
       }
     } on RequestFailure catch (exception) {
       return exception.response;
     }
     return null;
   }
 }