From ca38940409c4171eeea9e9dd6b10d27071262666 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 30 Dec 2024 09:37:19 -0800 Subject: [PATCH 1/2] Do not rely on the PackageGraph.objectClass late field --- lib/src/model/mixin.dart | 6 ++---- lib/src/model/package_graph.dart | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/src/model/mixin.dart b/lib/src/model/mixin.dart index 546d2b20cf..5495d9cb06 100644 --- a/lib/src/model/mixin.dart +++ b/lib/src/model/mixin.dart @@ -16,10 +16,8 @@ class Mixin extends InheritingContainer { final MixinElement element; late final List superclassConstraints = [ - ...element.superclassConstraints - .map((InterfaceType i) => - getTypeFor(i, library) as ParameterizedElementType) - .where((t) => t.modelElement != packageGraph.objectClass) + ...element.superclassConstraints.where((e) => !e.isDartCoreObject).map( + (InterfaceType i) => getTypeFor(i, library) as ParameterizedElementType) ]; @override diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart index 8f33354d71..7b09625ca2 100644 --- a/lib/src/model/package_graph.dart +++ b/lib/src/model/package_graph.dart @@ -204,6 +204,7 @@ class PackageGraph with CommentReferable, Nameable { final Map _modelNodes = {}; /// The Object class declared in the Dart SDK's 'dart:core' library. + // TODO(srawlins): I think nothing depends on this any longer; remove. late InheritingContainer objectClass; /// Populate's [_modelNodes] with elements in [resolvedLibrary]. From d5b756eea98c39ba6f1db6f7ceec77ab33052e4f Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 30 Dec 2024 09:42:39 -0800 Subject: [PATCH 2/2] Rev to 8.3.2 as well --- CHANGELOG.md | 4 ++++ dartdoc_options.yaml | 2 +- lib/src/version.dart | 2 +- pubspec.yaml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac50059c1d..70fded2b62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 8.3.2 + +* Fix a LateInitializationError by not depending on PackageGraph.objectClass. + ## 8.3.1 * Require Dart 3.5 or later. diff --git a/dartdoc_options.yaml b/dartdoc_options.yaml index 6447db9d91..3066a70e0c 100644 --- a/dartdoc_options.yaml +++ b/dartdoc_options.yaml @@ -1,4 +1,4 @@ dartdoc: linkToSource: root: '.' - uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v8.3.1/%f%#L%l%' + uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v8.3.2/%f%#L%l%' diff --git a/lib/src/version.dart b/lib/src/version.dart index 5f002528ce..4cd444aa6e 100644 --- a/lib/src/version.dart +++ b/lib/src/version.dart @@ -1 +1 @@ -const packageVersion = '8.3.1'; +const packageVersion = '8.3.2'; diff --git a/pubspec.yaml b/pubspec.yaml index 31895a4e54..361213d751 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: dartdoc -version: 8.3.1 +version: 8.3.2 description: A non-interactive HTML documentation generator for Dart source code. repository: https://github.com/dart-lang/dartdoc