600

Author: fshcheglov

lib/src/dartdoc_options.dart

@@ -14,7 +14,7 @@ library;
 
 import 'dart:io' show exitCode, stderr, stdout;
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:args/args.dart';
 import 'package:dartdoc/src/dartdoc.dart' show dartdocVersion, programName;
@@ -1128,18 +1128,18 @@ class DartdocOptionContext extends DartdocOptionContextBase
   /// Build a DartdocOptionContext from an analyzer element (using its source
   /// location).
   factory DartdocOptionContext.fromElement(DartdocOptionSet optionSet,
-      LibraryElement2 libraryElement, ResourceProvider resourceProvider) {
+      LibraryElement libraryElement, ResourceProvider resourceProvider) {
     return DartdocOptionContext(
         optionSet,
         resourceProvider.getFile(libraryElement.firstFragment.source.fullName),
         resourceProvider);
   }
 
   /// Build a DartdocOptionContext from an existing [DartdocOptionContext] and a
-  /// new analyzer [Element2].
+  /// new analyzer [Element].
   factory DartdocOptionContext.fromContextElement(
       DartdocOptionContext optionContext,
-      LibraryElement2 libraryElement,
+      LibraryElement libraryElement,
       ResourceProvider resourceProvider) {
     return DartdocOptionContext.fromElement(
         optionContext.optionSet, libraryElement, resourceProvider);

lib/src/element_type.dart

@@ -7,7 +7,7 @@
 /// The only entrypoint for constructing these classes is [ElementType.for_].
 library;
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
@@ -67,7 +67,7 @@ abstract class ElementType with CommentReferable, Nameable {
   String toString() => '$type';
 }
 
-/// An [ElementType] that isn't pinned to an [Element2] (or one that is, but
+/// An [ElementType] that isn't pinned to an [Element] (or one that is, but
 /// whose element is irrelevant).
 class UndefinedElementType extends ElementType {
   UndefinedElementType._(super.type, super.library, super.packageGraph)
@@ -102,9 +102,9 @@ class UndefinedElementType extends ElementType {
     // We can not simply throw here because not all SDK libraries resolve
     // all types.
     if (type is InvalidType) return 'dynamic';
-    assert(const {'Never'}.contains(type.documentableElement2?.name3),
+    assert(const {'Never'}.contains(type.documentableElement2?.name),
         'Unrecognized type for UndefinedElementType: $type');
-    return type.documentableElement2!.name3!;
+    return type.documentableElement2!.name!;
   }
 
   @override
@@ -129,7 +129,7 @@ class UndefinedElementType extends ElementType {
   Iterable<CommentReferable>? get referenceGrandparentOverrides => null;
 }
 
-/// A [FunctionType] that does not have an underpinning [Element2].
+/// A [FunctionType] that does not have an underpinning [Element].
 class FunctionTypeElementType extends UndefinedElementType
     with Rendered, Callable {
   FunctionTypeElementType._(
@@ -205,10 +205,10 @@ class ParameterizedElementType extends DefinedElementType with Rendered {
 
 /// An [ElementType] whose underlying type was referred to by a type alias.
 mixin Aliased implements ElementType {
-  Element2 get typeAliasElement2 => type.alias!.element2;
+  Element get typeAliasElement2 => type.alias!.element;
 
   @override
-  String get name => typeAliasElement2.name3!;
+  String get name => typeAliasElement2.name!;
 
   @override
   bool get isTypedef => true;
@@ -253,7 +253,7 @@ class TypeParameterElementType extends DefinedElementType {
   String get nameWithGenericsPlain => '$name$nullabilitySuffix';
 }
 
-/// An [ElementType] associated with an [Element2].
+/// An [ElementType] associated with an [Element].
 abstract class DefinedElementType extends ElementType {
   final ModelElement modelElement;
 
@@ -263,7 +263,7 @@ abstract class DefinedElementType extends ElementType {
 
   factory DefinedElementType._from(DartType type, ModelElement modelElement,
       Library library, PackageGraph packageGraph) {
-    if (type is! TypeAliasElement2 && type.alias != null) {
+    if (type is! TypeAliasElement && type.alias != null) {
       // Here, `alias.element` signals that this is a type referring to an
       // alias. (`TypeAliasElement.alias.element` has different implications.
       // In that case it is an actual type alias of some kind (generic or
@@ -288,7 +288,7 @@ abstract class DefinedElementType extends ElementType {
   }
 
   @override
-  String get name => type.documentableElement2!.name3!;
+  String get name => type.documentableElement2!.name!;
 
   @override
   String get fullyQualifiedName => modelElement.fullyQualifiedName;

lib/src/model/accessor.dart

@@ -4,10 +4,10 @@
 
 import 'dart:convert';
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/line_info.dart';
 // ignore: implementation_imports
-import 'package:analyzer/src/dart/element/member.dart' show ExecutableMember;
+import 'package:analyzer/src/dart/element/member.dart' show SubstitutedExecutableElementImpl;
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
@@ -20,7 +20,7 @@ import 'package:dartdoc/src/warnings.dart';
 class Accessor extends ModelElement {
 
   @override
-  final PropertyAccessorElement2 element;
+  final PropertyAccessorElement element;
 
   /// The combo ([Field] or [TopLevelVariable]) containing this accessor.
   ///
@@ -31,16 +31,16 @@ class Accessor extends ModelElement {
   late final GetterSetterCombo enclosingCombo;
 
   Accessor(this.element, super.library, super.packageGraph,
-      {ExecutableMember? super.originalMember});
+      {SubstitutedExecutableElementImpl? super.originalMember});
 
   @override
   CharacterLocation? get characterLocation => element.isSynthetic
       ? enclosingCombo.characterLocation
       : super.characterLocation;
 
   @override
-  ExecutableMember? get originalMember =>
-      super.originalMember as ExecutableMember?;
+  SubstitutedExecutableElementImpl? get originalMember =>
+      super.originalMember as SubstitutedExecutableElementImpl?;
 
   late final Callable modelType =
       getTypeFor((originalMember ?? element).type, library) as Callable;
@@ -49,7 +49,7 @@ class Accessor extends ModelElement {
 
   /// The [enclosingCombo] where this element was defined.
   late final GetterSetterCombo definingCombo =
-      getModelForElement(element.variable3!) as GetterSetterCombo;
+      getModelForElement(element.variable) as GetterSetterCombo;
 
   String get _sourceCode {
     if (!isSynthetic) {
@@ -117,10 +117,10 @@ class Accessor extends ModelElement {
   }
 
   @override
-  ModelElement get enclosingElement => switch (element.enclosingElement2) {
+  ModelElement get enclosingElement => switch (element.enclosingElement) {
         LibraryFragment enclosingCompilationUnit =>
           getModelForElement(enclosingCompilationUnit.element),
-        _ => getModelFor(element.enclosingElement2, library)
+        _ => getModelFor(element.enclosingElement, library)
       };
 
   @override
@@ -207,8 +207,8 @@ class ContainerAccessor extends Accessor with ContainerMember, Inheritable {
   @override
   ContainerAccessor? get overriddenElement {
     assert(packageGraph.allLibrariesAdded);
-    final parent = element.enclosingElement2;
-    if (parent is! InterfaceElement2) {
+    final parent = element.enclosingElement;
+    if (parent is! InterfaceElement) {
       return null;
     }
     for (final supertype in parent.allSupertypes) {
@@ -223,12 +223,12 @@ class ContainerAccessor extends Accessor with ContainerMember, Inheritable {
         continue;
       }
       final parentContainer =
-          getModelForElement(supertype.element3) as InheritingContainer;
+          getModelForElement(supertype.element) as InheritingContainer;
       final possibleFields =
           parentContainer.declaredFields.where((f) => !f.isStatic);
       final fieldName = accessor.lookupName?.replaceFirst('=', '');
       final foundField =
-          possibleFields.firstWhereOrNull((f) => f.element.name3 == fieldName);
+          possibleFields.firstWhereOrNull((f) => f.element.name == fieldName);
       if (foundField == null) {
         continue;
       }

lib/src/model/annotation.dart

@@ -46,10 +46,10 @@ final class Annotation extends Attribute {
       : _modelType.linkedName;
 
   late final ElementType _modelType = switch (_annotation.element2) {
-    ConstructorElement2(:var returnType) =>
+    ConstructorElement(:var returnType) =>
       _packageGraph.getTypeFor(returnType, _library),
-    PropertyAccessorElement2(:var variable3?) =>
-      (_packageGraph.getModelForElement(variable3) as GetterSetterCombo)
+    PropertyAccessorElement(:var variable) =>
+      (_packageGraph.getModelForElement(variable) as GetterSetterCombo)
           .modelType,
     _ => throw StateError(
         'non-callable element used as annotation?: ${_annotation.element2}')

lib/src/model/canonicalization.dart

@@ -36,7 +36,7 @@ Library? canonicalLibraryCandidate(ModelElement modelElement) {
     if (modelElement is Library) return true;
     var lookup = l.element.exportNamespace.definedNames2[topLevelElementName];
     return topLevelElement ==
-        (lookup is PropertyAccessorElement2 ? lookup.variable3 : lookup);
+        (lookup is PropertyAccessorElement ? lookup.variable : lookup);
   }).toList(growable: true);
 
   if (candidateLibraries.isEmpty) {

lib/src/model/comment_referable.dart

@@ -126,8 +126,8 @@ mixin CommentReferable implements Nameable {
     }
 
     ModelElement result;
-    if (resultElement is PropertyAccessorElement2) {
-      final variable = resultElement.variable3!;
+    if (resultElement is PropertyAccessorElement) {
+      final variable = resultElement.variable;
       if (variable.isSynthetic) {
         // First, cache the synthetic variable, so that the
         // PropertyAccessorElement getter and/or setter are set (see

lib/src/model/documentation_comment.dart

@@ -70,9 +70,7 @@ mixin DocumentationComment
 
   /// The rawest form of the documentation comment, including comment delimiters
   /// like `///`, `//`, `/*`, `*/`.
-  String get documentationComment => (element is Annotatable)
-      ? (element as Annotatable).documentationComment ?? ''
-      : '';
+  String get documentationComment => element.documentationComment ?? '';
 
   /// Whether `this` has a synthetic/inherited or local documentation comment,
   /// and false otherwise.

lib/src/model/inheriting_container.dart

@@ -541,9 +541,9 @@ abstract class InheritingContainer extends Container {
       // Pick an appropriate [FieldElement] to represent this element.
       // Only hard when dealing with a synthetic [Field].
       if (getter != null && setter == null) {
-        field = getterElement!.variable3 as FieldElement2;
+        field = getterElement!.variable as FieldElement;
       } else if (getter == null && setter != null) {
-        field = setterElement!.variable3 as FieldElement2;
+        field = setterElement!.variable as FieldElement;
       } else {
         // In this case: `getter != null && setter != null`.
         getter!;
@@ -556,9 +556,9 @@ abstract class InheritingContainer extends Container {
         if (setterEnclosingElement is Class &&
             setterEnclosingElement._isInheritingFrom(
                 getter.enclosingElement as InheritingContainer)) {
-          field = setterElement!.variable3 as FieldElement2;
+          field = setterElement!.variable3 as FieldElement;
         } else {
-          field = getterElement!.variable3 as FieldElement2;
+          field = getterElement!.variable3 as FieldElement;
         }
       }
     }

pubspec.yaml

@@ -7,7 +7,7 @@ environment:
   sdk: ^3.6.0
 
 dependencies:
-  analyzer: ^7.4.4
+  analyzer: ^8.1.1
   args: ^2.4.1
   collection: ^1.17.0
   crypto: ^3.0.3

tool/mustachio/codegen_runtime_renderer.dart

@@ -7,7 +7,7 @@ library;
 
 import 'dart:collection';
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_provider.dart';
@@ -48,18 +48,18 @@ class RuntimeRenderersBuilder {
 
   /// Maps a type to the name of the render function which can render that type
   /// as a context type.
-  final _typeToRenderFunctionName = <InterfaceElement2, String>{};
+  final _typeToRenderFunctionName = <InterfaceElement, String>{};
 
   /// Maps a type to the name of the renderer class which can render that type
   /// as a context type.
-  final _typeToRendererClassName = <InterfaceElement2, String>{};
+  final _typeToRendererClassName = <InterfaceElement, String>{};
 
   final Uri _sourceUri;
 
   final TypeProvider _typeProvider;
   final TypeSystem _typeSystem;
 
-  final Set<Element2> _allVisibleElements;
+  final Set<Element> _allVisibleElements;
 
   /// Whether renderer classes are public. This should only be true for testing.
   final bool _rendererClassesArePublic;
@@ -104,7 +104,7 @@ import '${path.basename(_sourceUri.path)}';
 ''');
 
     specs.forEach(_addTypesForRendererSpec);
-    var builtRenderers = <InterfaceElement2>{};
+    var builtRenderers = <InterfaceElement>{};
     var elementsToProcess = _typesToProcess.toList()
       ..sort((a, b) => a._typeName.compareTo(b._typeName));
 
@@ -135,21 +135,21 @@ import '${path.basename(_sourceUri.path)}';
     spec.contextType.getters.forEach(_addPropertyToProcess);
 
     for (var mixin in spec.contextElement.mixins) {
-      _addTypeToProcess(mixin.element3,
+      _addTypeToProcess(mixin.element,
           isFullRenderer: true, includeRenderFunction: false);
     }
     var superclass = spec.contextElement.supertype;
 
     while (superclass != null) {
       // Any type specified with a renderer spec (`@Renderer`) is full.
-      _addTypeToProcess(superclass.element3,
+      _addTypeToProcess(superclass.element,
           isFullRenderer: true, includeRenderFunction: false);
-      for (var mixin in superclass.element3.mixins) {
-        _addTypeToProcess(mixin.element3,
+      for (var mixin in superclass.element.mixins) {
+        _addTypeToProcess(mixin.element,
             isFullRenderer: true, includeRenderFunction: false);
       }
       superclass.getters.forEach(_addPropertyToProcess);
-      superclass = superclass.element3.supertype;
+      superclass = superclass.element.supertype;
     }
   }
 
@@ -717,17 +717,15 @@ extension on InterfaceElement2 {
 extension on GetterElement {
   // Whether this getter should be omitted from the runtime renderer code.
   bool get shouldBeOmitted {
-    var variable = variable3;
     return isPrivate ||
         isStatic ||
-        metadata2.hasInternal ||
-        metadata2.hasProtected ||
-        metadata2.hasVisibleForOverriding ||
-        metadata2.hasVisibleForTesting ||
-        variable == null ||
-        variable.metadata2.hasInternal ||
-        variable.metadata2.hasProtected ||
-        variable.metadata2.hasVisibleForOverriding ||
-        variable.metadata2.hasVisibleForTesting;
+        metadata.hasInternal ||
+        metadata.hasProtected ||
+        metadata.hasVisibleForOverriding ||
+        metadata.hasVisibleForTesting ||
+        variable.metadata.hasInternal ||
+        variable.metadata.hasProtected ||
+        variable.metadata.hasVisibleForOverriding ||
+        variable.metadata.hasVisibleForTesting;
   }
 }