Skip to content

Commit ca38940

Browse files
committed
Do not rely on the PackageGraph.objectClass late field
1 parent c8be845 commit ca38940

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

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].

0 commit comments

Comments
 (0)