Append the href of each library with a slash (#3940)

dart-lang · Dec 4, 2024 · e3ecb4d · e3ecb4d
1 parent 7444b39
commit e3ecb4d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/lib/resources/docs.dart.js.map b/lib/resources/docs.dart.js.map
diff --git a/lib/src/model/library.dart b/lib/src/model/library.dart
@@ -219,7 +219,7 @@ class Library extends ModelElement
     // The file name for a library is 'index.html', so we just link to the
     // directory name. This keeps the URL looking short, _without_ the
     // 'index.html' in the URL.
-    return '${package.baseHref}$dirName';
+    return '${package.baseHref}$dirName/';
   }
 
   /// The previous value of [filePath].

diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart
@@ -1194,17 +1194,25 @@ void main() async {
         expect(
           aFunctionUsingRenamedLib.documentationAsHtml,
           contains(
-              'Link to library: <a href="${htmlBasePlaceholder}mylibpub">renamedLib</a>'),
+            'Link to library: '
+            '<a href="${htmlBasePlaceholder}mylibpub/">renamedLib</a>',
+          ),
         );
         expect(
           aFunctionUsingRenamedLib.documentationAsHtml,
           contains(
-              'Link to constructor (implied, no new): <a href="${htmlBasePlaceholder}mylibpub/YetAnotherHelper/YetAnotherHelper.html">renamedLib.YetAnotherHelper()</a>'),
+            'Link to constructor (implied, no new): '
+            '<a href="${htmlBasePlaceholder}mylibpub/YetAnotherHelper/YetAnotherHelper.html">'
+            'renamedLib.YetAnotherHelper()</a>',
+          ),
         );
         expect(
           aFunctionUsingRenamedLib.documentationAsHtml,
           contains(
-              'Link to class: <a href="${htmlBasePlaceholder}mylibpub/YetAnotherHelper-class.html">renamedLib.YetAnotherHelper</a>'),
+            'Link to class: '
+            '<a href="${htmlBasePlaceholder}mylibpub/YetAnotherHelper-class.html">'
+            'renamedLib.YetAnotherHelper</a>',
+          ),
         );
         expect(
           aFunctionUsingRenamedLib.documentationAsHtml,

diff --git a/test/libraries_test.dart b/test/libraries_test.dart
@@ -174,7 +174,7 @@ A doc comment.
     var dartAsyncLib = sdkPackage.libraries.named('dart:async');
     expect(dartAsyncLib.name, 'dart:async');
     expect(dartAsyncLib.dirName, 'dart-async');
-    expect(dartAsyncLib.href, '${htmlBasePlaceholder}dart-async');
+    expect(dartAsyncLib.href, '${htmlBasePlaceholder}dart-async/');
   });
 }
 
@@ -191,7 +191,7 @@ class LibrariesTest extends DartdocTestBase {
 
     expect(library.name, 'libraries');
     expect(library.qualifiedName, 'libraries');
-    expect(library.href, '${placeholder}libraries');
+    expect(library.href, '${placeholder}libraries/');
   }
 
   void test_library_containsClassWithSameNameAsDartSdk() async {
@@ -212,7 +212,7 @@ class LibrariesTest extends DartdocTestBase {
 
     expect(library.name, 'lib1');
     expect(library.qualifiedName, 'lib1');
-    expect(library.href, '${placeholder}lib1');
+    expect(library.href, '${placeholder}lib1/');
     expect(library.redirectingPath, 'lib1/lib1-library.html');
   }
 
@@ -230,7 +230,7 @@ export 'src/library.dart';
     );
     expect(library.qualifiedName, 'libraries');
     expect(library.name, 'libraries');
-    expect(library.href, '${placeholder}public');
+    expect(library.href, '${placeholder}public/');
   }
 }
 
@@ -278,7 +278,7 @@ version: 0.0.1
 
     expect(library.name, 'lib2');
     expect(library.qualifiedName, 'lib2');
-    expect(library.href, '${placeholder}package-two_lib2');
+    expect(library.href, '${placeholder}package-two_lib2/');
     expect(
       library.redirectingPath,
       'package-two_lib2/package-two_lib2-library.html',
@@ -292,7 +292,7 @@ version: 0.0.1
 
     expect(library.name, 'lib2');
     expect(library.qualifiedName, 'lib2');
-    expect(library.href, '${placeholder}package-two_lib2');
+    expect(library.href, '${placeholder}package-two_lib2/');
     expect(
       library.redirectingPath,
       'package-two_lib2/package-two_lib2-library.html',
@@ -306,7 +306,7 @@ version: 0.0.1
 
     expect(library.name, 'lib2');
     expect(library.qualifiedName, 'lib2');
-    expect(library.href, '${placeholder}lib2');
+    expect(library.href, '${placeholder}lib2/');
     expect(library.redirectingPath, 'lib2/lib2-library.html');
   }
 }
diff --git a/test/prefixes_test.dart b/test/prefixes_test.dart
@@ -32,7 +32,7 @@ int x = 0;
     var x = library.properties.named('x');
     expect(
       x.documentationAsHtml,
-      '<p>Text <a href="$dartAsyncUrlPrefix">async</a>.</p>',
+      '<p>Text <a href="$dartAsyncUrlPrefix/">async</a>.</p>',
     );
   }
 

diff --git a/test/search_index_test.dart b/test/search_index_test.dart
@@ -84,7 +84,7 @@ class C {}
       equals({
         'name': 'index_json',
         'kind': Kind.library.index,
-        'href': '%%__HTMLBASE_dartdoc_internal__%%index_json',
+        'href': '%%__HTMLBASE_dartdoc_internal__%%index_json/',
       }),
     );
   }