Fix for writing structures of imported libraries.

pkg/analyzer/lib/src/summary/incremental_cache.dart

 // Copyright (c) 2016, 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.
 
 import 'dart:convert';
 import 'dart:core' hide Resource;
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/generated/engine.dart';
@@ skipping 122 matching lines @@
    * [LibraryBundleWithId]s were already returned as a part of the closure of
    * another library, they are still included - it is up to the client to
    * decide whether a bundle should be used or not, but it is easy to do
    * using [LibraryBundleWithId.id].
    */
   List<LibraryBundleWithId> getLibraryClosureBundles(Source librarySource) {
     try {
       List<Source> closureSources = _getLibraryClosure(librarySource);
       List<LibraryBundleWithId> closureBundles = <LibraryBundleWithId>[];
       for (Source source in closureSources) {
-        if (source.isInSystemLibrary) {
-          continue;
-        }
         if (getSourceKind(source) == SourceKind.PART) {
           continue;
         }
         String key = _getLibraryBundleKey(source);
         PackageBundle bundle = _getLibraryBundle(key);
         if (bundle == null) {
           return null;
         }
         closureBundles.add(new LibraryBundleWithId(source, key, bundle));
       }
@@ skipping 87 matching lines @@
     List<int> bytes = builder.toBuffer();
     storage.put(key, bytes);
   }
 
   /**
    * Fill the whole source closure of the library with the given
    * [librarySource]. It includes defining units and parts of the library and
    * all its directly or indirectly imported or exported libraries.
    */
   void _appendLibraryClosure(Set<Source> closure, Source librarySource) {
+    if (librarySource.isInSystemLibrary) {
+      return;
+    }
     if (closure.add(librarySource)) {
       CacheSourceContent contentSource = _getCacheSourceContent(librarySource);
       if (contentSource == null) {
         throw new StateError('No structure for $librarySource');
       }
       // Append parts.
       for (String partUri in contentSource.partUris) {
         Source partSource = _resolveUri(librarySource, partUri);
         if (partSource == null) {
           throw new StateError('Unable to resolve $partUri in $librarySource');
@@ skipping 187 matching lines @@
       });
     }
     // Resolve relative URIs without caching.
     return context.sourceFactory.resolveUri(containingSource, containedUri);
   }
 
   /**
    * Write the content based information about the given [source].
    */
   void _writeCacheSourceContent(Source source, CacheSourceContentBuilder b) {
-    String key = _getCacheSourceContentKey(source);
-    List<int> bytes = b.toBuffer();
-    storage.put(key, bytes);
-    // Put into the cache to avoid reading it later.
-    _sourceContentMap[source] = new CacheSourceContent.fromBuffer(bytes);
+    if (!_sourceContentMap.containsKey(source)) {
+      String key = _getCacheSourceContentKey(source);
+      List<int> bytes = b.toBuffer();
+      storage.put(key, bytes);
+      // Put into the cache to avoid reading it later.
+      _sourceContentMap[source] = new CacheSourceContent.fromBuffer(bytes);
+    }
   }
 
   /**
    * Write [CacheSourceContent] for every unit of the given [library] and its
    * direct and indirect imports/exports.
    */
   void _writeCacheSourceContents(LibraryElement library,
       [Set<LibraryElement> writtenLibraries]) {
     Source librarySource = library.source;
-    // Do nothing if already cached.
-    if (_sourceContentMap.containsKey(librarySource)) {
-      return;
-    }
     // Stop recursion cycle.
     writtenLibraries ??= new Set<LibraryElement>();
     if (!writtenLibraries.add(library)) {
       return;
     }
     // Write parts.
     List<String> partUris = <String>[];
     for (CompilationUnitElement part in library.parts) {
       partUris.add(part.uri);
       Source partSource = part.source;
@@ skipping 45 matching lines @@
    */
   final String id;
 
   /**
    * The payload bundle.
    */
   final PackageBundle bundle;
 
   LibraryBundleWithId(this.source, this.id, this.bundle);
 }