| 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 719c2f8cb4f6d2b80cb6434294c1840de7c116a4..b7c1acb3c403920cd034d8a07b599711c51c391d 100644
|
| --- a/pkg/analyzer/lib/src/summary/resynthesize.dart
|
| +++ b/pkg/analyzer/lib/src/summary/resynthesize.dart
|
| @@ -181,7 +181,7 @@ class SummaryResynthesizer extends ElementResynthesizer {
|
| getUnlinkedSummary(uri)
|
| ];
|
| Source librarySource = _getSource(uri);
|
| - for (UnlinkedPart part in serializedUnits[0].parts) {
|
| + for (UnlinkedPart part in serializedUnits[0].publicNamespace.parts) {
|
| String partAbsUri =
|
| sourceFactory.resolveUri(librarySource, part.uri).uri.toString();
|
| serializedUnits.add(getUnlinkedSummary(partAbsUri));
|
| @@ -654,11 +654,12 @@ class _LibraryResynthesizer {
|
| definingCompilationUnit.librarySource = librarySource;
|
| List<CompilationUnitElement> parts = <CompilationUnitElement>[];
|
| UnlinkedUnit unlinkedDefiningUnit = unlinkedUnits[0];
|
| - assert(
|
| - unlinkedDefiningUnit.parts.length + 1 == prelinkedLibrary.units.length);
|
| + assert(unlinkedDefiningUnit.publicNamespace.parts.length + 1 ==
|
| + prelinkedLibrary.units.length);
|
| for (int i = 1; i < prelinkedLibrary.units.length; i++) {
|
| - CompilationUnitElementImpl part =
|
| - buildPart(unlinkedDefiningUnit.parts[i - 1].uri, unlinkedUnits[i]);
|
| + CompilationUnitElementImpl part = buildPart(
|
| + unlinkedDefiningUnit.publicNamespace.parts[i - 1].uri,
|
| + unlinkedUnits[i]);
|
| parts.add(part);
|
| }
|
| libraryElement.parts = parts;
|
| @@ -669,7 +670,7 @@ class _LibraryResynthesizer {
|
| }
|
| libraryElement.imports = imports;
|
| libraryElement.exports =
|
| - unlinkedDefiningUnit.exports.map(buildExport).toList();
|
| + unlinkedDefiningUnit.publicNamespace.exports.map(buildExport).toList();
|
| populateUnit(definingCompilationUnit, 0);
|
| for (int i = 0; i < parts.length; i++) {
|
| populateUnit(parts[i], i + 1);
|
| @@ -765,7 +766,8 @@ class _LibraryResynthesizer {
|
| if (referenceResolution.unit != 0) {
|
| UnlinkedUnit referencedLibraryDefiningUnit =
|
| summaryResynthesizer.getUnlinkedSummary(referencedLibraryUri);
|
| - String uri = referencedLibraryDefiningUnit.parts[0].uri;
|
| + String uri =
|
| + referencedLibraryDefiningUnit.publicNamespace.parts[0].uri;
|
| Source partSource = summaryResynthesizer.sourceFactory
|
| .resolveUri(referencedLibrarySource, uri);
|
| partUri = partSource.uri.toString();
|
| @@ -780,7 +782,8 @@ class _LibraryResynthesizer {
|
| } else {
|
| referencedLibraryUri = librarySource.uri.toString();
|
| if (referenceResolution.unit != 0) {
|
| - String uri = unlinkedUnits[0].parts[referenceResolution.unit - 1].uri;
|
| + String uri = unlinkedUnits[0].publicNamespace.parts[
|
| + referenceResolution.unit - 1].uri;
|
| Source partSource =
|
| summaryResynthesizer.sourceFactory.resolveUri(librarySource, uri);
|
| partUri = partSource.uri.toString();
|
|
|