Skip to content

Commit 5abb1b8

Browse files
committed
Stop using TypeDefiningElement.
1 parent 42daf01 commit 5abb1b8

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

lib/src/element_type.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ abstract class ElementType with CommentReferable, Nameable {
3434
factory ElementType.for_(
3535
DartType type, Library library, PackageGraph packageGraph) {
3636
runtimeStats.incrementAccumulator('elementTypeInstantiation');
37-
var fElement = type.documentableElement2;
37+
var fElement = type.documentableElement;
3838
if (fElement == null ||
3939
fElement.kind == ElementKind.DYNAMIC ||
4040
fElement.kind == ElementKind.NEVER) {
@@ -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?.name),
105+
assert(const {'Never'}.contains(type.documentableElement?.name),
106106
'Unrecognized type for UndefinedElementType: $type');
107-
return type.documentableElement2!.name!;
107+
return type.documentableElement!.name!;
108108
}
109109

110110
@override
@@ -288,7 +288,7 @@ abstract class DefinedElementType extends ElementType {
288288
}
289289

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

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

lib/src/model/model_element.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ abstract class ModelElement
295295
TypeAliasElement(aliasedType: FunctionType()) =>
296296
FunctionTypedef(e, library, packageGraph),
297297
TypeAliasElement()
298-
when e.aliasedType.documentableElement2 is InterfaceElement =>
298+
when e.aliasedType.documentableElement is InterfaceElement =>
299299
ClassTypedef(e, library, packageGraph),
300300
TypeAliasElement() => GeneralizedTypedef(e, library, packageGraph),
301301
MethodElement(isOperator: true) when enclosingContainer == null =>

lib/src/type_utils.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import 'package:analyzer/dart/element/element.dart';
66
import 'package:analyzer/dart/element/type.dart';
77

88
extension DartTypeExtension on DartType {
9-
/// The static element associataed with this type, where documentable, and
9+
/// The static element associated with this type, where documentable, and
1010
/// `null` otherwise.
1111
///
1212
/// For example, the documentable element of [DynamicType] is `null`, as there
1313
/// is no documentation for `dynamic` which we can link to.
14-
TypeDefiningElement? get documentableElement2 {
14+
Element? get documentableElement {
1515
final self = this;
1616
return switch (self) {
1717
InterfaceType() => self.element,
18-
NeverType() => self.element as TypeDefiningElement,
18+
NeverType() => self.element,
1919
TypeParameterType() => self.element,
2020
_ => null
2121
};

tool/mustachio/codegen_aot_compiler.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ extension on StringBuffer {
935935
if (bound == null) {
936936
write(typeParameter.name);
937937
} else {
938-
var boundElement = bound.documentableElement2!;
938+
var boundElement = bound.documentableElement!;
939939
referencedElements.add(boundElement);
940940
write('${typeParameter.name} extends ${boundElement.name!}');
941941
}

0 commit comments

Comments
 (0)