Fix cross-partition dependency handling (issue 26466)

pkg/analyzer/lib/src/context/context.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 analyzer.src.context.context;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 98 matching lines @@
    * contexts.
    */
   CachePartition _privatePartition;
 
   /**
    * The cache in which information about the results associated with targets
    * are stored.
    */
   AnalysisCache _cache;
 
+  @override
+  final ReentrantSynchronousStream<InvalidatedResult> onResultInvalidated =
+    new ReentrantSynchronousStream<InvalidatedResult>();
+
+  ReentrantSynchronousStreamSubscription onResultInvalidatedSubscription = null;
+
   /**
    * Configuration data associated with this context.
    */
   final HashMap<ResultDescriptor, Object> _configurationData =
       new HashMap<ResultDescriptor, Object>();
 
   /**
    * The task manager used to manage the tasks used to analyze code.
    */
   TaskManager _taskManager;
@@ skipping 285 matching lines @@
       return;
     } else if (factory.context != null) {
       throw new IllegalStateException(
           "Source factories cannot be shared between contexts");
     }
     if (_sourceFactory != null) {
       _sourceFactory.context = null;
     }
     factory.context = this;
     _sourceFactory = factory;
+    _cache?.dispose();
     _cache = createCacheFromSourceFactory(factory);
     for (WorkManager workManager in workManagers) {
       workManager.onSourceFactoryChanged();
     }
   }
 
   @override
   List<Source> get sources {
     return _cache.sources.toList();
   }
@@ skipping 237 matching lines @@
       throw new AnalysisException(
           'Cannot compute $descriptor for $target', entry.exception);
     }
     return entry.getValue(descriptor);
   }
 
   /**
    * Create an analysis cache based on the given source [factory].
    */
   AnalysisCache createCacheFromSourceFactory(SourceFactory factory) {
-    if (factory == null) {
-      return new AnalysisCache(<CachePartition>[_privatePartition]);
+    AnalysisCache createCache() {
+      if (factory == null) {
+        return new AnalysisCache(<CachePartition>[_privatePartition]);
+      }
+      DartSdk sdk = factory.dartSdk;
+      if (sdk == null) {
+        return new AnalysisCache(<CachePartition>[_privatePartition]);
+      }
+      return new AnalysisCache(<CachePartition>[
+        AnalysisEngine.instance.partitionManager.forSdk(sdk),
+        _privatePartition
+      ]);
     }
-    DartSdk sdk = factory.dartSdk;
-    if (sdk == null) {
-      return new AnalysisCache(<CachePartition>[_privatePartition]);
+
+    AnalysisCache cache = createCache();
+    if (onResultInvalidatedSubscription != null) {
+      onResultInvalidatedSubscription.cancel();

[scheglov, 2016/05/25 01:44:44]

We could use here:
onResultInvalidatedSubscription?.cancel();

[Brian Wilkerson, 2016/05/25 14:42:33]

Done

     }
-    AnalysisCache cache = new AnalysisCache(<CachePartition>[
-      AnalysisEngine.instance.partitionManager.forSdk(sdk),
-      _privatePartition
-    ]);
-    cache.onResultInvalidated.listen((InvalidatedResult event) {
+    onResultInvalidatedSubscription = cache.onResultInvalidated.listen((InvalidatedResult event) {
+      onResultInvalidated.add(event);
       StreamController<ResultChangedEvent> controller =
           _resultChangedControllers[event.descriptor];
       if (controller != null) {
         controller.add(new ResultChangedEvent(
             this, event.entry.target, event.descriptor, event.value, false));
       }
     });
     return cache;
   }
 
@@ skipping 369 matching lines @@
           .add(new SourcesChangedEvent.changedContent(source, newContents));
     }
     return changed;
   }
 
   /**
    * Invalidate analysis cache and notify work managers that they have work
    * to do.
    */
   void invalidateCachedResults() {
+    _cache?.dispose();
     _cache = createCacheFromSourceFactory(_sourceFactory);
     for (WorkManager workManager in workManagers) {
       workManager.onAnalysisOptionsChanged();
     }
   }
 
   @override
   void invalidateLibraryHints(Source librarySource) {
     List<Source> sources = getResult(librarySource, UNITS);
     if (sources != null) {
@@ skipping 1106 matching lines @@
     }
     DartSdk sdk = factory.dartSdk;
     if (sdk == null) {
       throw new IllegalArgumentException(
           "The source factory for an SDK analysis context must have a DartUriResolver");
     }
     return new AnalysisCache(
         <CachePartition>[AnalysisEngine.instance.partitionManager.forSdk(sdk)]);
   }
 }