fix resolver tests

dart-lang · Oct 8, 2024 · ccfb8f8 · ccfb8f8
1 parent d142fd8
commit ccfb8f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/build_resolvers/lib/src/resolver.dart b/build_resolvers/lib/src/resolver.dart
@@ -65,9 +65,10 @@ class PerActionResolver implements ReleasableResolver {
       // model manually.
       yield current;
       final toCrawl = current.definingCompilationUnit.libraryImports
-          .map((import) => import.library)
+          .map((import) => import.importedLibrary)
           .followedBy(current.definingCompilationUnit.libraryExports
-              .map((export) => export.library))
+              .map((export) => export.exportedLibrary))
+          .nonNulls
           .where((library) => !seen.contains(library))
           .toSet();
       toVisit.addAll(toCrawl);

diff --git a/build_resolvers/test/resolver_test.dart b/build_resolvers/test/resolver_test.dart
@@ -50,7 +50,7 @@ void main() {
         var libA = lib
           ..definingCompilationUnit
               .libraryImports
-              .where((l) => l.library.name == 'a')
+              .where((l) => l.importedLibrary!.name == 'a')
               .single;
         expect(libA.getClass('Foo'), isNull);
       }, resolvers: AnalyzerResolvers());
@@ -72,7 +72,7 @@ void main() {
         var libB = lib
           ..definingCompilationUnit
               .libraryImports
-              .where((l) => l.library.name == 'b')
+              .where((l) => l.importedLibrary!.name == 'b')
               .single;
         expect(libB.getClass('Foo'), isNull);
       }, resolvers: AnalyzerResolvers());
@@ -466,7 +466,7 @@ void main() {
       }, (resolver) async {
         var entry = await resolver.libraryFor(AssetId('a', 'lib/a.dart'));
         var classDefinition = entry.definingCompilationUnit.libraryImports
-            .map((l) => l.library.getClass('SomeClass'))
+            .map((l) => l.importedLibrary!.getClass('SomeClass'))
             .singleWhere((c) => c != null)!;
         expect(await resolver.assetIdForElement(classDefinition),
             AssetId('a', 'lib/b.dart'));