Fine. Fix re-re-export TODO in LibraryManifestBuilder.

Change-Id: I37437ca9a652a5deb946403e2806ddffe7b5d47d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449369
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/fine/library_manifest.dart

@@ -605,35 +605,23 @@ class LibraryManifestBuilder {
         var element = entry.value;
 
         // Skip elements that exist in nowhere.
-        var elementLibraryUri = element.library?.uri;
-        if (elementLibraryUri == null) {
-          continue;
-        }
-
-        // Skip elements declared in this library.
-        if (elementLibraryUri == libraryUri) {
+        var elementLibrary = element.library as LibraryElementImpl?;
+        if (elementLibrary == null) {
           continue;
         }
 
         // Skip if the element is declared in this library.
-        if (element.library == libraryElement) {
+        if (identical(elementLibrary, libraryElement)) {
           continue;
         }
 
-        // Maybe exported from a library outside the current cycle.
-        var id = elementFactory.getElementId(element);
+        // Every library has a manifest at this point.
+        // We already set manifests for the current cycle.
+        var elementLibraryManifest = elementLibrary.manifest!;
 
-        // If not, then look into new manifest.
-        if (id == null) {
-          var newManifest = newManifests[elementLibraryUri];
-          id ??= newManifest?.getExportedId(name);
-          // TODO(scheglov): repeat for re-re-exports
-        }
-
-        if (id == null) {
-          // TODO(scheglov): complete
-          continue;
-        }
+        // We use the manifest of the library that declares this element.
+        // So, the element must be declared in the manifest.
+        var id = elementLibraryManifest.getDeclaredId(name)!;
         manifest.reExportMap[name] = id;
       }
     }

pkg/analyzer/lib/src/fine/requirements.dart

@@ -1938,16 +1938,18 @@ class RequirementsManifest {
   /// requirements to the libraries of this same library cycle. We already
   /// link these libraries together, so only requirements to the previous
   /// libraries are interesting.
-  void removeReqForLibs(Set<Uri> bundleLibraryUriList) {
-    var uriSet = bundleLibraryUriList.toSet();
-
+  void removeReqForLibs(Set<Uri> bundleLibraryUriSet) {
     for (var exportRequirement in exportRequirements) {
       exportRequirement.exports.removeWhere((export) {
-        return uriSet.contains(export.exportedUri);
+        return bundleLibraryUriSet.contains(export.exportedUri);
       });
     }
 
-    for (var libUri in bundleLibraryUriList) {
+    exportRequirements.removeWhere(
+      (exportRequirement) => exportRequirement.exports.isEmpty,
+    );
+
+    for (var libUri in bundleLibraryUriSet) {
       libraries.remove(libUri);
     }
   }

pkg/analyzer/test/src/dart/analysis/driver_test.dart

@@ -18897,6 +18897,251 @@ class C {}
     );
   }
 
+  test_dependency_export_class_reExport_chain_external() async {
+    var a = newFile('$testPackageLibPath/a.dart', r'''
+class A1 {}
+class A2 {}
+class A3 {}
+''');
+
+    newFile('$testPackageLibPath/b.dart', r'''
+export 'a.dart';
+class B {}
+''');
+
+    newFile('$testPackageLibPath/test.dart', r'''
+export 'b.dart';
+''');
+
+    configuration.elementTextConfiguration.withExportScope = true;
+    await _runChangeScenario(
+      operation: _FineOperationGetTestLibrary(),
+      expectedInitialEvents: r'''
+[status] working
+[operation] linkLibraryCycle SDK
+[operation] linkLibraryCycle
+  package:test/a.dart
+    declaredClasses
+      A1: #M0
+        interface: #M1
+      A2: #M2
+        interface: #M3
+      A3: #M4
+        interface: #M5
+  requirements
+[operation] linkLibraryCycle
+  package:test/b.dart
+    declaredClasses
+      B: #M6
+        interface: #M7
+    reExportMap
+      A1: #M0
+      A2: #M2
+      A3: #M4
+  requirements
+    exportRequirements
+      package:test/b.dart
+        declaredTopNames: B
+        exports
+          package:test/a.dart
+            A1: #M0
+            A2: #M2
+            A3: #M4
+[operation] linkLibraryCycle
+  package:test/test.dart
+    reExportMap
+      A1: #M0
+      A2: #M2
+      A3: #M4
+      B: #M6
+  requirements
+    exportRequirements
+      package:test/test.dart
+        exports
+          package:test/b.dart
+            A1: #M0
+            A2: #M2
+            A3: #M4
+            B: #M6
+[status] idle
+[future] getLibraryByUri T1
+  library
+    exportedReferences
+      exported[(0, 0)] package:test/a.dart::@class::A1
+      exported[(0, 0)] package:test/a.dart::@class::A2
+      exported[(0, 0)] package:test/a.dart::@class::A3
+      exported[(0, 0)] package:test/b.dart::@class::B
+    exportNamespace
+      A1: package:test/a.dart::@class::A1
+      A2: package:test/a.dart::@class::A2
+      A3: package:test/a.dart::@class::A3
+      B: package:test/b.dart::@class::B
+''',
+      updateFiles: () {
+        modifyFile2(a, r'''
+abstract class A2 {}
+class A3 {}
+''');
+        return [a];
+      },
+      expectedUpdatedEvents: r'''
+[status] working
+[operation] linkLibraryCycle
+  package:test/a.dart
+    declaredClasses
+      A2: #M8
+        interface: #M9
+      A3: #M4
+        interface: #M5
+  requirements
+[operation] checkLinkedBundleRequirements
+  package:test/b.dart
+  exportIdMismatch
+    fragmentUri: package:test/b.dart
+    exportedUri: package:test/a.dart
+    name: A2
+    expectedId: #M2
+    actualId: #M8
+[operation] linkLibraryCycle
+  package:test/b.dart
+    declaredClasses
+      B: #M6
+        interface: #M7
+    reExportMap
+      A2: #M8
+      A3: #M4
+  requirements
+    exportRequirements
+      package:test/b.dart
+        declaredTopNames: B
+        exports
+          package:test/a.dart
+            A2: #M8
+            A3: #M4
+[operation] checkLinkedBundleRequirements
+  package:test/test.dart
+  exportIdMismatch
+    fragmentUri: package:test/test.dart
+    exportedUri: package:test/b.dart
+    name: A2
+    expectedId: #M2
+    actualId: #M8
+[operation] linkLibraryCycle
+  package:test/test.dart
+    reExportMap
+      A2: #M8
+      A3: #M4
+      B: #M6
+  requirements
+    exportRequirements
+      package:test/test.dart
+        exports
+          package:test/b.dart
+            A2: #M8
+            A3: #M4
+            B: #M6
+[status] idle
+[future] getLibraryByUri T2
+  library
+    exportedReferences
+      exported[(0, 0)] package:test/a.dart::@class::A2
+      exported[(0, 0)] package:test/a.dart::@class::A3
+      exported[(0, 0)] package:test/b.dart::@class::B
+    exportNamespace
+      A2: package:test/a.dart::@class::A2
+      A3: package:test/a.dart::@class::A3
+      B: package:test/b.dart::@class::B
+''',
+    );
+  }
+
+  test_dependency_export_class_reExport_chain_thisCycle() async {
+    var a = newFile('$testPackageLibPath/a.dart', r'''
+import 'test.dart';
+class A1 {}
+class A2 {}
+class A3 {}
+''');
+
+    newFile('$testPackageLibPath/b.dart', r'''
+export 'a.dart';
+class B {}
+''');
+
+    newFile('$testPackageLibPath/test.dart', r'''
+export 'b.dart';
+''');
+
+    await _runChangeScenario(
+      operation: _FineOperationGetTestLibrary(),
+      expectedInitialEvents: r'''
+[status] working
+[operation] linkLibraryCycle SDK
+[operation] linkLibraryCycle
+  package:test/a.dart
+    declaredClasses
+      A1: #M0
+        interface: #M1
+      A2: #M2
+        interface: #M3
+      A3: #M4
+        interface: #M5
+  package:test/b.dart
+    declaredClasses
+      B: #M6
+        interface: #M7
+    reExportMap
+      A1: #M0
+      A2: #M2
+      A3: #M4
+  package:test/test.dart
+    reExportMap
+      A1: #M0
+      A2: #M2
+      A3: #M4
+      B: #M6
+  requirements
+[status] idle
+[future] getLibraryByUri T1
+  library
+''',
+      updateFiles: () {
+        modifyFile2(a, r'''
+import 'test.dart';
+abstract class A2 {}
+class A3 {}
+''');
+        return [a];
+      },
+      expectedUpdatedEvents: r'''
+[status] working
+[operation] linkLibraryCycle
+  package:test/a.dart
+    declaredClasses
+      A2: #M8
+        interface: #M9
+      A3: #M4
+        interface: #M5
+  package:test/b.dart
+    declaredClasses
+      B: #M6
+        interface: #M7
+    reExportMap
+      A2: #M8
+      A3: #M4
+  package:test/test.dart
+    reExportMap
+      A2: #M8
+      A3: #M4
+      B: #M6
+  requirements
+[status] idle
+[future] getLibraryByUri T2
+  library
+''',
+    );
+  }
+
   test_dependency_export_class_reExport_combinatorShow() async {
     var a = newFile('$testPackageLibPath/a.dart', r'''
 class A {}