Skip to content

Commit 41c34be

Browse files
authored
Require analyzer ^8.1.1 and migrate off deprecated APIs (#4086)
Fixes #4085
1 parent 82b48b5 commit 41c34be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+748
-946
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* Remove the deprecated `nodoc` option.
55
* Remove the deprecated `include-external` option.
66
* Refactor 404 error page to use div instead of p for search form.
7+
* Require analyzer 8.1.1 APIs.
8+
* Many internal migrations for analyzer APIs.
79

810
## 8.3.4
911
* The URL for category pages now uses _category name_ instead of

lib/src/dartdoc_options.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ library;
1414

1515
import 'dart:io' show exitCode, stderr, stdout;
1616

17-
import 'package:analyzer/dart/element/element2.dart';
17+
import 'package:analyzer/dart/element/element.dart';
1818
import 'package:analyzer/file_system/file_system.dart';
1919
import 'package:args/args.dart';
2020
import 'package:dartdoc/src/dartdoc.dart' show dartdocVersion, programName;
@@ -1128,18 +1128,18 @@ class DartdocOptionContext extends DartdocOptionContextBase
11281128
/// Build a DartdocOptionContext from an analyzer element (using its source
11291129
/// location).
11301130
factory DartdocOptionContext.fromElement(DartdocOptionSet optionSet,
1131-
LibraryElement2 libraryElement, ResourceProvider resourceProvider) {
1131+
LibraryElement libraryElement, ResourceProvider resourceProvider) {
11321132
return DartdocOptionContext(
11331133
optionSet,
11341134
resourceProvider.getFile(libraryElement.firstFragment.source.fullName),
11351135
resourceProvider);
11361136
}
11371137

11381138
/// Build a DartdocOptionContext from an existing [DartdocOptionContext] and a
1139-
/// new analyzer [Element2].
1139+
/// new analyzer [Element].
11401140
factory DartdocOptionContext.fromContextElement(
11411141
DartdocOptionContext optionContext,
1142-
LibraryElement2 libraryElement,
1142+
LibraryElement libraryElement,
11431143
ResourceProvider resourceProvider) {
11441144
return DartdocOptionContext.fromElement(
11451145
optionContext.optionSet, libraryElement, resourceProvider);

lib/src/element_type.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/// The only entrypoint for constructing these classes is [ElementType.for_].
88
library;
99

10-
import 'package:analyzer/dart/element/element2.dart';
10+
import 'package:analyzer/dart/element/element.dart';
1111
import 'package:analyzer/dart/element/nullability_suffix.dart';
1212
import 'package:analyzer/dart/element/type.dart';
1313
import 'package:dartdoc/src/model/comment_referable.dart';
@@ -67,7 +67,7 @@ abstract class ElementType with CommentReferable, Nameable {
6767
String toString() => '$type';
6868
}
6969

70-
/// An [ElementType] that isn't pinned to an [Element2] (or one that is, but
70+
/// An [ElementType] that isn't pinned to an [Element] (or one that is, but
7171
/// whose element is irrelevant).
7272
class UndefinedElementType extends ElementType {
7373
UndefinedElementType._(super.type, super.library, super.packageGraph)
@@ -102,9 +102,9 @@ class UndefinedElementType extends ElementType {
102102
// We can not simply throw here because not all SDK libraries resolve
103103
// all types.
104104
if (type is InvalidType) return 'dynamic';
105-
assert(const {'Never'}.contains(type.documentableElement2?.name3),
105+
assert(const {'Never'}.contains(type.documentableElement2?.name),
106106
'Unrecognized type for UndefinedElementType: $type');
107-
return type.documentableElement2!.name3!;
107+
return type.documentableElement2!.name!;
108108
}
109109

110110
@override
@@ -129,7 +129,7 @@ class UndefinedElementType extends ElementType {
129129
Iterable<CommentReferable>? get referenceGrandparentOverrides => null;
130130
}
131131

132-
/// A [FunctionType] that does not have an underpinning [Element2].
132+
/// A [FunctionType] that does not have an underpinning [Element].
133133
class FunctionTypeElementType extends UndefinedElementType
134134
with Rendered, Callable {
135135
FunctionTypeElementType._(
@@ -205,10 +205,10 @@ class ParameterizedElementType extends DefinedElementType with Rendered {
205205

206206
/// An [ElementType] whose underlying type was referred to by a type alias.
207207
mixin Aliased implements ElementType {
208-
Element2 get typeAliasElement2 => type.alias!.element2;
208+
Element get typeAliasElement2 => type.alias!.element;
209209

210210
@override
211-
String get name => typeAliasElement2.name3!;
211+
String get name => typeAliasElement2.name!;
212212

213213
@override
214214
bool get isTypedef => true;
@@ -253,7 +253,7 @@ class TypeParameterElementType extends DefinedElementType {
253253
String get nameWithGenericsPlain => '$name$nullabilitySuffix';
254254
}
255255

256-
/// An [ElementType] associated with an [Element2].
256+
/// An [ElementType] associated with an [Element].
257257
abstract class DefinedElementType extends ElementType {
258258
final ModelElement modelElement;
259259

@@ -263,7 +263,7 @@ abstract class DefinedElementType extends ElementType {
263263

264264
factory DefinedElementType._from(DartType type, ModelElement modelElement,
265265
Library library, PackageGraph packageGraph) {
266-
if (type is! TypeAliasElement2 && type.alias != null) {
266+
if (type is! TypeAliasElement && type.alias != null) {
267267
// Here, `alias.element` signals that this is a type referring to an
268268
// alias. (`TypeAliasElement.alias.element` has different implications.
269269
// In that case it is an actual type alias of some kind (generic or
@@ -288,7 +288,7 @@ abstract class DefinedElementType extends ElementType {
288288
}
289289

290290
@override
291-
String get name => type.documentableElement2!.name3!;
291+
String get name => type.documentableElement2!.name!;
292292

293293
@override
294294
String get fullyQualifiedName => modelElement.fullyQualifiedName;

0 commit comments

Comments
 (0)