Fix summary resynthesis in the event of a self-import.

pkg/analyzer/lib/src/summary/resynthesize.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 summary_resynthesizer;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 1036 matching lines @@
     for (LinkedExportName exportName in exportNames) {
       definedNames.putIfAbsent(
           exportName.name, () => buildExportName(exportName));
     }
     return new Namespace(definedNames);
   }
 
   /**
    * Resynthesize an [ImportElement].
    */
-  ImportElement buildImport(_UnitResynthesizer definingUnitResynthesizer,
-      UnlinkedImport serializedImport, int dependency) {
+  ImportElement buildImport(
+      _UnitResynthesizer definingUnitResynthesizer,
+      UnlinkedImport serializedImport,
+      int dependency,
+      LibraryElement libraryBeingResynthesized) {
     bool isSynthetic = serializedImport.isImplicit;
     ImportElementImpl importElement =
         new ImportElementImpl(isSynthetic ? -1 : serializedImport.offset);
-    String absoluteUri = summaryResynthesizer.sourceFactory
-        .resolveUri(librarySource, linkedLibrary.dependencies[dependency].uri)
-        .uri
-        .toString();
-    importElement.importedLibrary = new LibraryElementHandle(
-        summaryResynthesizer,
-        new ElementLocationImpl.con3(<String>[absoluteUri]));
+    if (dependency == 0) {
+      importElement.importedLibrary = libraryBeingResynthesized;
+    } else {
+      String absoluteUri = summaryResynthesizer.sourceFactory
+          .resolveUri(librarySource, linkedLibrary.dependencies[dependency].uri)
+          .uri
+          .toString();
+      importElement.importedLibrary = new LibraryElementHandle(
+          summaryResynthesizer,
+          new ElementLocationImpl.con3(<String>[absoluteUri]));
+    }
     if (isSynthetic) {
       importElement.synthetic = true;
     } else {
       importElement.uri = serializedImport.uri;
       importElement.uriOffset = serializedImport.uriOffset;
       importElement.uriEnd = serializedImport.uriEnd;
       importElement.deferred = serializedImport.isDeferred;
       definingUnitResynthesizer.buildAnnotations(
           importElement, serializedImport.annotations);
     }
@@ skipping 44 matching lines @@
           i);
       partUnits.add(part);
     }
     library.parts = partUnits;
     // Create imports.
     List<ImportElement> imports = <ImportElement>[];
     for (int i = 0; i < unlinkedDefiningUnit.imports.length; i++) {
       imports.add(buildImport(
           definingUnitResynthesizer,
           unlinkedDefiningUnit.imports[i],
-          linkedLibrary.importDependencies[i]));
+          linkedLibrary.importDependencies[i],
+          library));
     }
     library.imports = imports;
     // Create exports.
     List<ExportElement> exports = <ExportElement>[];
     assert(unlinkedDefiningUnit.exports.length ==
         unlinkedDefiningUnit.publicNamespace.exports.length);
     for (int i = 0; i < unlinkedDefiningUnit.exports.length; i++) {
       exports.add(buildExport(
           definingUnitResynthesizer,
           unlinkedDefiningUnit.publicNamespace.exports[i],
@@ skipping 1495 matching lines @@
   static String _getElementIdentifier(String name, ReferenceKind kind) {
     if (kind == ReferenceKind.topLevelPropertyAccessor ||
         kind == ReferenceKind.propertyAccessor) {
       if (!name.endsWith('=')) {
         return name + '?';
       }
     }
     return name;
   }
 }