| Index: pkg/analyzer/lib/src/dart/analysis/driver.dart
|
| diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
|
| index cba1690475d813ec5789ef17b96e31b303f42086..8931939e2c2489b2a3df293b4dd1861d4a155ba7 100644
|
| --- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
|
| +++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
|
| @@ -735,12 +735,15 @@ class AnalysisDriver {
|
| libraryContext.store,
|
| library);
|
| Map<FileState, UnitAnalysisResult> results = analyzer.analyze();
|
| - UnitAnalysisResult fileResult = results[file];
|
| - resolvedUnit = fileResult.unit;
|
| -
|
| - // Store the result into the cache.
|
| - bytes = _storeResolvedUnit(
|
| - library, file, resolvedUnit, fileResult.errors);
|
| + for (FileState unitFile in results.keys) {
|
| + UnitAnalysisResult unitResult = results[unitFile];
|
| + List<int> unitBytes = _storeResolvedUnit(
|
| + library, unitFile, unitResult.unit, unitResult.errors);
|
| + if (unitFile == file) {
|
| + bytes = unitBytes;
|
| + resolvedUnit = unitResult.unit;
|
| + }
|
| + }
|
| } else {
|
| ResolutionResult resolutionResult =
|
| libraryContext.resolveUnit(library.source, file.source);
|
|
|