Add uriOffset and uriEnd to the summary.

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

Index: pkg/analyzer/lib/src/summary/resynthesize.dart
diff --git a/pkg/analyzer/lib/src/summary/resynthesize.dart b/pkg/analyzer/lib/src/summary/resynthesize.dart
index 168069365dddb201aa3788b24a14d9be42f23456..8b700d82648750f4e087836ce3a35cfcce7d7e94 100644
--- a/pkg/analyzer/lib/src/summary/resynthesize.dart
+++ b/pkg/analyzer/lib/src/summary/resynthesize.dart
@@ -117,8 +117,8 @@ class SummaryResynthesizer extends ElementResynthesizer {
         getUnlinkedSummary(uri)
       ];
       Source librarySource = _getSource(uri);
-      for (UnlinkedPart part in serializedUnits[0].publicNamespace.parts) {
-        Source partSource = sourceFactory.resolveUri(librarySource, part.uri);
+      for (String part in serializedUnits[0].publicNamespace.parts) {
+        Source partSource = sourceFactory.resolveUri(librarySource, part);
         String partAbsUri = partSource.uri.toString();
         serializedUnits.add(getUnlinkedSummary(partAbsUri));
       }
@@ -471,18 +471,21 @@ class _LibraryResynthesizer {
   /**
    * Resynthesize an [ExportElement],
    */
-  ExportElement buildExport(UnlinkedExport serializedExport) {
+  ExportElement buildExport(UnlinkedExportPublic serializedExportPublic,
+      UnlinkedExportNonPublic serializedExportNonPublic) {
     ExportElementImpl exportElement = new ExportElementImpl(0);
     String exportedLibraryUri = summaryResynthesizer.sourceFactory
-        .resolveUri(librarySource, serializedExport.uri)
+        .resolveUri(librarySource, serializedExportPublic.uri)
         .uri
         .toString();
     exportElement.exportedLibrary = new LibraryElementHandle(
         summaryResynthesizer,
         new ElementLocationImpl.con3(<String>[exportedLibraryUri]));
-    exportElement.uri = serializedExport.uri;
+    exportElement.uri = serializedExportPublic.uri;
     exportElement.combinators =
-        serializedExport.combinators.map(buildCombinator).toList();
+        serializedExportPublic.combinators.map(buildCombinator).toList();
+    exportElement.uriOffset = serializedExportNonPublic.uriOffset;
+    exportElement.uriEnd = serializedExportNonPublic.uriEnd;
     return exportElement;
   }
 
@@ -599,6 +602,8 @@ class _LibraryResynthesizer {
       importElement.synthetic = true;
     } else {
       importElement.uri = serializedImport.uri;
+      importElement.uriOffset = serializedImport.uriOffset;
+      importElement.uriEnd = serializedImport.uriEnd;
     }
     if (serializedImport.prefixReference != 0) {
       UnlinkedReference serializedPrefix =
@@ -628,7 +633,8 @@ class _LibraryResynthesizer {
         prelinkedLibrary.units.length);
     for (int i = 1; i < prelinkedLibrary.units.length; i++) {
       CompilationUnitElementImpl part = buildPart(
-          unlinkedDefiningUnit.publicNamespace.parts[i - 1].uri,
+          unlinkedDefiningUnit.publicNamespace.parts[i - 1],
+          unlinkedDefiningUnit.parts[i - 1],
           unlinkedUnits[i]);
       parts.add(part);
     }
@@ -639,8 +645,14 @@ class _LibraryResynthesizer {
           prelinkedLibrary.importDependencies[i]));
     }
     libraryElement.imports = imports;
-    libraryElement.exports =
-        unlinkedDefiningUnit.publicNamespace.exports.map(buildExport).toList();
+    List<ExportElement> exports = <ExportElement>[];
+    assert(unlinkedDefiningUnit.exports.length ==
+        unlinkedDefiningUnit.publicNamespace.exports.length);
+    for (int i = 0; i < unlinkedDefiningUnit.exports.length; i++) {
+      exports.add(buildExport(unlinkedDefiningUnit.publicNamespace.exports[i],
+          unlinkedDefiningUnit.exports[i]));
+    }
+    libraryElement.exports = exports;
     populateUnit(definingCompilationUnit, 0);
     for (int i = 0; i < parts.length; i++) {
       populateUnit(parts[i], i + 1);
@@ -699,11 +711,13 @@ class _LibraryResynthesizer {
    * than the defining compilation unit.
    */
   CompilationUnitElementImpl buildPart(
-      String uri, UnlinkedUnit serializedPart) {
+      String uri, UnlinkedPart partDecl, UnlinkedUnit serializedPart) {
     Source unitSource =
         summaryResynthesizer.sourceFactory.resolveUri(librarySource, uri);
     CompilationUnitElementImpl partUnit =
         new CompilationUnitElementImpl(unitSource.shortName);
+    partUnit.uriOffset = partDecl.uriOffset;
+    partUnit.uriEnd = partDecl.uriEnd;
     partUnit.source = unitSource;
     partUnit.librarySource = librarySource;
     partUnit.uri = uri;
@@ -720,8 +734,7 @@ class _LibraryResynthesizer {
     if (type.paramReference != 0) {
       // TODO(paulberry): make this work for generic methods.
       return currentTypeParameters[
-              currentTypeParameters.length - type.paramReference]
-          .type;
+          currentTypeParameters.length - type.paramReference].type;
     } else {
       // TODO(paulberry): handle references to things other than classes (note:
       // this should only occur in the case of erroneous code).
@@ -745,8 +758,8 @@ class _LibraryResynthesizer {
         if (referenceResolution.unit != 0) {
           UnlinkedUnit referencedLibraryDefiningUnit =
               summaryResynthesizer.getUnlinkedSummary(referencedLibraryUri);
-          String uri = referencedLibraryDefiningUnit
-              .publicNamespace.parts[referenceResolution.unit - 1].uri;
+          String uri = referencedLibraryDefiningUnit.publicNamespace.parts[
+              referenceResolution.unit - 1];
           Source partSource = summaryResynthesizer.sourceFactory
               .resolveUri(referencedLibrarySource, uri);
           partUri = partSource.uri.toString();
@@ -761,10 +774,8 @@ class _LibraryResynthesizer {
       } else {
         referencedLibraryUri = librarySource.uri.toString();
         if (referenceResolution.unit != 0) {
-          String uri = unlinkedUnits[0]
-              .publicNamespace
-              .parts[referenceResolution.unit - 1]
-              .uri;
+          String uri = unlinkedUnits[0].publicNamespace.parts[
+              referenceResolution.unit - 1];
           Source partSource =
               summaryResynthesizer.sourceFactory.resolveUri(librarySource, uri);
           partUri = partSource.uri.toString();