Skip to content

Commit 51256a3

Browse files
authored
Avoid the PackageGraph.objectClass field. (#3951)
Rev to 8.3.2 as well
1 parent c8be845 commit 51256a3

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 8.3.2
2+
3+
* Fix a LateInitializationError by not depending on PackageGraph.objectClass.
4+
15
## 8.3.1
26

37
* Require Dart 3.5 or later.

dartdoc_options.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dartdoc:
22
linkToSource:
33
root: '.'
4-
uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v8.3.1/%f%#L%l%'
4+
uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v8.3.2/%f%#L%l%'

lib/src/model/mixin.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ class Mixin extends InheritingContainer {
1616
final MixinElement element;
1717

1818
late final List<ParameterizedElementType> superclassConstraints = [
19-
...element.superclassConstraints
20-
.map((InterfaceType i) =>
21-
getTypeFor(i, library) as ParameterizedElementType)
22-
.where((t) => t.modelElement != packageGraph.objectClass)
19+
...element.superclassConstraints.where((e) => !e.isDartCoreObject).map(
20+
(InterfaceType i) => getTypeFor(i, library) as ParameterizedElementType)
2321
];
2422

2523
@override

lib/src/model/package_graph.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ class PackageGraph with CommentReferable, Nameable {
204204
final Map<Element, ModelNode> _modelNodes = {};
205205

206206
/// The Object class declared in the Dart SDK's 'dart:core' library.
207+
// TODO(srawlins): I think nothing depends on this any longer; remove.
207208
late InheritingContainer objectClass;
208209

209210
/// Populate's [_modelNodes] with elements in [resolvedLibrary].

lib/src/version.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
const packageVersion = '8.3.1';
1+
const packageVersion = '8.3.2';

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: dartdoc
2-
version: 8.3.1
2+
version: 8.3.2
33
description: A non-interactive HTML documentation generator for Dart source code.
44
repository: https://github.com/dart-lang/dartdoc
55

0 commit comments

Comments
 (0)