Fix enum links for exported enums (#3957)

dart-lang · Jan 6, 2025 · 591173b · 591173b
1 parent c8dd09c
commit 591173b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/lib/src/model/enum.dart b/lib/src/model/enum.dart
@@ -117,9 +117,9 @@ class EnumField extends Field {
       return canonicalModelElement?.href;
     }
     assert(canonicalEnclosingContainer == enclosingElement);
-    // TODO(jcollins-g): EnumField should not depend on enclosingElement, but
-    // we sort of have to while we are half-converted to [FileStructure].
-    return '${package.baseHref}${enclosingElement.library.dirName}/${enclosingElement.fileName}';
+    assert(canonicalLibrary != null);
+    return '${package.baseHref}${canonicalLibrary!.dirName}/'
+        '${enclosingElement.fileName}';
   }
 
   @override

diff --git a/test/enums_test.dart b/test/enums_test.dart
@@ -8,6 +8,7 @@ import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import 'dartdoc_test_base.dart';
+import 'src/test_descriptor_utils.dart' as d;
 import 'src/utils.dart';
 
 void main() {
@@ -637,6 +638,23 @@ enum E {
     expect(oneValue.constantValue, equals(oneValue.renderedName));
   }
 
+  void test_value_linksToItsAnchor_inExportedLib() async {
+    var library = (await bootPackageFromFiles([
+      d.file('lib/src/library.dart', '''
+enum E { one, two three }
+'''),
+      d.file('lib/enums.dart', '''
+export 'src/library.dart';
+'''),
+    ]))
+        .libraries
+        .named(libraryName);
+    var oneValue =
+        library.enums.named('E').publicEnumValues.named('one') as EnumField;
+    expect(oneValue.linkedName, '<a href="$linkPrefix/E.html#one">one</a>');
+    expect(oneValue.constantValue, equals(oneValue.renderedName));
+  }
+
   void test_values_haveIndices() async {
     var library = await bootPackageWithLibrary('enum E { one, two, three }');
     var oneValue =

diff --git a/test/src/utils.dart b/test/src/utils.dart
@@ -355,7 +355,16 @@ bool get classModifiersAllowed =>
         .allows(platformVersion);
 
 extension ModelElementIterableExtension<T extends ModelElement> on Iterable<T> {
-  T named(String name) => singleWhere((e) => e.name == name);
+  T named(String name) {
+    var elements = where((e) => e.name == name).toList();
+    if (elements.isEmpty) {
+      throw StateError("No $T elements named '$name'");
+    }
+    if (elements.length > 1) {
+      throw StateError("Too many $T elements named '$name': $elements");
+    }
+    return elements.single;
+  }
 
   T displayNamed(String displayName) =>
       singleWhere((e) => e.displayName == displayName);