Skip to content

Commit c2fdf4a

Browse files
committed
Merge branch 'main' into misc/try-out-workspaces
2 parents acf0ce9 + c7f1160 commit c2fdf4a

File tree

6 files changed

+19
-68
lines changed

6 files changed

+19
-68
lines changed

build.yaml

Lines changed: 0 additions & 55 deletions
This file was deleted.

lib/resources/docs.dart.js

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/resources/docs.dart.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/src/model/directives/categorization.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ final RegExp _categoryRegExp =
1111
/// Mixin parsing the `@category` directive for ModelElements.
1212
mixin Categorization on DocumentationComment {
1313
@override
14-
String buildDocumentationAddition(String rawDocs) =>
15-
_stripAndSetDartdocCategories(super.buildDocumentationAddition(rawDocs));
14+
String buildDocumentationAddition(String docs) =>
15+
_stripAndSetDartdocCategories(super.buildDocumentationAddition(docs));
1616

1717
/// Parse `{@category ...}` and related information in API comments, stripping
1818
/// out that information from the given comments and returning the stripped

tool/dartdoc_web/lib/sidebars.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,14 @@ void _loadSidebar(
9797
/// if "base href" is not being used.
9898
void _updateLinks(String baseHref, Node node) {
9999
if (node.isA<HTMLAnchorElement>()) {
100-
final hrefString = (node as HTMLAnchorElement).href;
101-
final href = Uri.tryParse(hrefString);
100+
final hrefValue =
101+
(node as HTMLAnchorElement).attributes.getNamedItem('href')?.value;
102+
if (hrefValue == null) {
103+
return;
104+
}
105+
final href = Uri.tryParse(hrefValue);
102106
if (href != null && !href.isAbsolute) {
103-
node.href = '$baseHref$hrefString';
107+
node.href = '$baseHref$hrefValue';
104108
}
105109
}
106110

tool/dartdoc_web/sig.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
C2560F62DBBA541F7513332AE41D9219
1+
EEADF842B2AE78DEC9DD494D82525D85

0 commit comments

Comments
 (0)