@@ -10,6 +10,7 @@ import 'package:meta/meta.dart';
1010import 'constant.dart' ;
1111import 'definition.dart' ;
1212import 'helper.dart' ;
13+ import 'loading_unit.dart' ;
1314import 'metadata.dart' ;
1415import 'reference.dart' ;
1516import 'serialization_context.dart' ;
@@ -116,9 +117,9 @@ Error: $e
116117 static LoadingUnitDeserializationContext _deserializeLoadingUnits (
117118 RecordedUsesSyntax syntax,
118119 ) {
119- final loadingUnits = < String > [];
120+ final loadingUnits = < LoadingUnit > [];
120121 for (final unit in syntax.loadingUnits ?? < LoadingUnitSyntax > []) {
121- loadingUnits.add (unit.name);
122+ loadingUnits.add (LoadingUnit ( unit.name) );
122123 }
123124 return LoadingUnitDeserializationContext (loadingUnits);
124125 }
@@ -200,7 +201,7 @@ Error: $e
200201 loadingUnits: allLoadingUnits.isEmpty
201202 ? null
202203 : allLoadingUnits
203- .map ((unit) => LoadingUnitSyntax (name: unit))
204+ .map ((unit) => LoadingUnitSyntax (name: unit.name ))
204205 .toList (),
205206 definitions: context.definitions.isEmpty
206207 ? null
@@ -252,15 +253,17 @@ Error: $e
252253 ),
253254 }.flatten ();
254255
255- Iterable <String > _collectLoadingUnits () => {
256- ...calls.values.expand ((calls) => calls).map ((call) => call.loadingUnit! ),
256+ Iterable <LoadingUnit > _collectLoadingUnits () => {
257+ ...calls.values
258+ .expand ((calls) => calls)
259+ .expand ((call) => call.loadingUnits),
257260 ...instances.values
258261 .expand ((instances) => instances)
259- .map ((instance) => instance.loadingUnit ! ),
262+ .expand ((instance) => instance.loadingUnits ),
260263 };
261264
262265 LoadingUnitSerializationContext _serializeLoadingUnits (
263- Iterable <String > allLoadingUnits,
266+ Iterable <LoadingUnit > allLoadingUnits,
264267 ) => LoadingUnitSerializationContext (
265268 allLoadingUnits.asMapToIndices,
266269 );
0 commit comments