Bug fixes for the new task model

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:math' show max;
 
 import 'package:analysis_server/plugin/analyzed_files.dart';
 import 'package:analysis_server/src/analysis_logger.dart';
 import 'package:analysis_server/src/channel/channel.dart';
 import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/operation/operation.dart';
 import 'package:analysis_server/src/operation/operation_analysis.dart';
 import 'package:analysis_server/src/operation/operation_queue.dart';
 import 'package:analysis_server/src/plugin/server_plugin.dart';
 import 'package:analysis_server/src/protocol.dart' hide Element;
 import 'package:analysis_server/src/services/correction/namespace.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analysis_server/src/source/optimizing_pub_package_map_provider.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
+import 'package:analyzer/src/context/context.dart' as newContext;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_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:plugin/plugin.dart';
+import 'package:analyzer/src/context/cache.dart';

[scheglov, 2015/06/01 22:19:06]

Sort imports?

+import 'package:analyzer/task/dart.dart';
+import 'package:analyzer/src/task/dart.dart';
 
 typedef void OptionUpdater(AnalysisOptionsImpl options);
 
 /**
  * Enum representing reasons why analysis might be done for a given file.
  */
 class AnalysisDoneReason {
   /**
    * Analysis of the file completed successfully.
    */
@@ skipping 973 matching lines @@
     // that the shutdown response can be sent and logged.
     new Future(() {
       instrumentationService.shutdown();
       channel.close();
     });
   }
 
   void test_flushResolvedUnit(String file) {
     if (AnalysisEngine.isDartFileName(file)) {
       ContextSourcePair contextSource = getContextSourcePair(file);
-      AnalysisContextImpl context = contextSource.context;
+      AnalysisContext context = contextSource.context;
       Source source = contextSource.source;
-      DartEntry dartEntry = context.getReadableSourceEntryOrNull(source);
-      dartEntry.flushAstStructures();
+      if (context is AnalysisContextImpl) {
+        DartEntry dartEntry = context.getReadableSourceEntryOrNull(source);
+        dartEntry.flushAstStructures();
+      } else if (context is newContext.AnalysisContextImpl) {
+        CacheEntry entry = context.getCacheEntry(source);
+        entry.setState(RESOLVED_UNIT1, CacheState.FLUSHED);
+        entry.setState(RESOLVED_UNIT2, CacheState.FLUSHED);
+        entry.setState(RESOLVED_UNIT3, CacheState.FLUSHED);
+        entry.setState(RESOLVED_UNIT4, CacheState.FLUSHED);
+        entry.setState(RESOLVED_UNIT5, CacheState.FLUSHED);
+        entry.setState(RESOLVED_UNIT6, CacheState.FLUSHED);
+        entry.setState(RESOLVED_UNIT, CacheState.FLUSHED);
+      }
     }
   }
 
   /**
    * Performs all scheduled analysis operations.
    */
   void test_performAllAnalysisOperations() {
     while (true) {
       ServerOperation operation = operationQueue.takeIf((operation) {
         return operation is PerformAnalysisOperation;
@@ skipping 485 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');
 }