400

Author: fshcheglov

lib/src/model/annotation.dart

@@ -4,7 +4,7 @@
 
 import 'dart:convert';
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/attribute.dart';
 import 'package:dartdoc/src/model/class.dart';
@@ -22,7 +22,7 @@ final class Annotation extends Attribute {
   final PackageGraph _packageGraph;
 
   Annotation(this._annotation, this._library, this._packageGraph)
-      : super(_annotation.element2!.name3!);
+      : super(_annotation.element!.name!);
 
   @override
   String get linkedNameWithParameters {
@@ -40,19 +40,19 @@ final class Annotation extends Attribute {
   }
 
   @override
-  String get linkedName => _annotation.element2 is PropertyAccessorElement2
-      ? _packageGraph.getModelForElement(_annotation.element2!).linkedName
+  String get linkedName => _annotation.element is PropertyAccessorElement
+      ? _packageGraph.getModelForElement(_annotation.element!).linkedName
       // TODO(jcollins-g): consider linking to constructor instead of type?
       : _modelType.linkedName;
 
-  late final ElementType _modelType = switch (_annotation.element2) {
+  late final ElementType _modelType = switch (_annotation.element) {
     ConstructorElement(:var returnType) =>
       _packageGraph.getTypeFor(returnType, _library),
     PropertyAccessorElement(:var variable) =>
       (_packageGraph.getModelForElement(variable) as GetterSetterCombo)
           .modelType,
     _ => throw StateError(
-        'non-callable element used as annotation?: ${_annotation.element2}')
+        'non-callable element used as annotation?: ${_annotation.element}')
   };
 
   bool get isPublic {

lib/src/model/canonicalization.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/warnings.dart';
 
@@ -19,11 +19,11 @@ Library? canonicalLibraryCandidate(ModelElement modelElement) {
 
   // Since we're looking for a library, go up in the tree until we find it.
   var topLevelElement = modelElement.element;
-  while (topLevelElement.enclosingElement2 is! LibraryElement2 &&
-      topLevelElement.enclosingElement2 != null) {
-    topLevelElement = topLevelElement.enclosingElement2!;
+  while (topLevelElement.enclosingElement is! LibraryElement &&
+      topLevelElement.enclosingElement != null) {
+    topLevelElement = topLevelElement.enclosingElement!;
   }
-  var topLevelElementName = topLevelElement.name3;
+  var topLevelElementName = topLevelElement.name;
   if (topLevelElementName == null) {
     // Any member of an unnamed extension is not public, and has no
     // canonical library.
@@ -84,16 +84,16 @@ final class _Canonicalization {
     }
   }
 
-  String _getElementLocation(Element2 element) {
+  String _getElementLocation(Element element) {
     var components = <String>[];
-    Element2? ancestor = element;
+    Element? ancestor = element;
     while (ancestor != null) {
-      if (ancestor is LibraryElement2) {
+      if (ancestor is LibraryElement) {
         components.insert(0, ancestor.uri.toString());
       } else {
-        components.insert(0, ancestor.name3!);
+        components.insert(0, ancestor.name!);
       }
-      ancestor = ancestor.enclosingElement2;
+      ancestor = ancestor.enclosingElement;
     }
     var buffer = StringBuffer();
     var length = components.length;

lib/src/model/category.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
@@ -78,7 +78,7 @@ class Category
   }
 
   @override
-  Element2? get element => null;
+  Element? get element => null;
 
   @override
   String get name => _categoryDefinition.displayName;

lib/src/model/class.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/model/kind.dart';
 import 'package:dartdoc/src/model/model.dart';
 
@@ -15,7 +15,7 @@ import 'package:dartdoc/src/model/model.dart';
 /// **inherited**: Filtered getters giving only inherited children.
 class Class extends InheritingContainer with Constructable, MixedInTypes {
   @override
-  final ClassElement2 element;
+  final ClassElement element;
 
   @override
   late final List<ModelElement> allModelElements = [
@@ -29,8 +29,8 @@ class Class extends InheritingContainer with Constructable, MixedInTypes {
 
   Class(this.element, Library library, PackageGraph packageGraph)
       : super(library, packageGraph) {
-    if (element.name3 == 'Object' &&
-        library.element.name3 == 'dart.core' &&
+    if (element.name == 'Object' &&
+        library.element.name == 'dart.core' &&
         package.name == 'Dart') {
       packageGraph.objectClass = this;
     }
@@ -46,11 +46,11 @@ class Class extends InheritingContainer with Constructable, MixedInTypes {
   bool get isBase => element.isBase && !element.isSealed;
 
   bool get isErrorOrException {
-    bool isError(InterfaceElement2 e) =>
-        e.library2.isDartCore && (e.name3 == 'Exception' || e.name3 == 'Error');
+    bool isError(InterfaceElement e) =>
+        e.library.isDartCore && (e.name == 'Exception' || e.name == 'Error');
 
     if (isError(element)) return true;
-    return element.allSupertypes.map((t) => t.element3).any(isError);
+    return element.allSupertypes.map((t) => t.element).any(isError);
   }
 
   @override

lib/src/model/comment_referable.dart

@@ -8,7 +8,7 @@ library;
 import 'dart:core';
 
 import 'package:analyzer/dart/analysis/features.dart';
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/scope.dart';
 import 'package:collection/collection.dart';
 import 'package:dartdoc/src/model/library.dart';
@@ -105,7 +105,7 @@ mixin CommentReferable implements Nameable {
     _ReferenceChildrenLookup referenceLookup, {
     required bool Function(CommentReferable?) filter,
   }) {
-    Element2? resultElement;
+    Element? resultElement;
     final scope = this.scope;
     if (scope != null) {
       resultElement = scope.lookupPreferGetter(referenceLookup.lookup);
@@ -207,16 +207,16 @@ mixin CommentReferable implements Nameable {
   Library? get library => null;
 
   /// For testing / comparison only, get the comment referable from where this
-  /// `ElementType` was defined.  Override where an [Element2] is available.
+  /// `ElementType` was defined.  Override where an [Elemen2] is available.
   @internal
   CommentReferable get definingCommentReferable => this;
 }
 
 extension on Scope {
   /// Prefer the getter for a bundled lookup if both exist.
-  Element2? lookupPreferGetter(String id) {
+  Element? lookupPreferGetter(String id) {
     var result = lookup(id);
-    return result.getter2 ?? result.setter2;
+    return result.getter ?? result.setter;
   }
 }
 

lib/src/model/constructor.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
@@ -12,7 +12,7 @@ import 'package:dartdoc/src/model_utils.dart';
 
 class Constructor extends ModelElement with ContainerMember, TypeParameters {
   @override
-  final ConstructorElement2 element;
+  final ConstructorElement element;
 
   Constructor(this.element, super.library, super.packageGraph);
 
@@ -25,7 +25,7 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
       return enclosingElement.characterLocation;
     }
     final lineInfo = unitElement.lineInfo;
-    var offset = element.firstFragment.nameOffset2 ??
+    var offset = element.firstFragment.nameOffset ??
         element.firstFragment.typeNameOffset;
     if (offset != null && offset >= 0) {
       return lineInfo.getLocation(offset);
@@ -37,10 +37,10 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
   bool get isPublic {
     if (!super.isPublic) return false;
     if (element.hasPrivateName) return false;
-    var class_ = element.enclosingElement2;
+    var class_ = element.enclosingElement;
     // Enums cannot be explicitly constructed or extended.
-    if (class_ is EnumElement2) return false;
-    if (class_ is ClassElement2) {
+    if (class_ is EnumElement) return false;
+    if (class_ is ClassElement) {
       if (element.isFactory) return true;
       if (class_.isSealed ||
           (class_.isAbstract && class_.isFinal) ||
@@ -60,7 +60,7 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
 
   @override
   Container get enclosingElement =>
-      getModelFor(element.enclosingElement2, library) as Container;
+      getModelFor(element.enclosingElement, library) as Container;
 
   @override
   String get fileName =>
@@ -85,7 +85,7 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
   @override
   bool get isConst => element.isConst;
 
-  bool get isUnnamedConstructor => element.name3 == 'new';
+  bool get isUnnamedConstructor => element.name == 'new';
 
   bool get isFactory => element.isFactory;
 
@@ -100,11 +100,11 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
       // TODO(jcollins-g): After the old lookup code is retired, rationalize
       // [name] around the conventions used in referenceChildren and replace
       // code there and elsewhere with simple references to the name.
-      '${enclosingElement.name}.${element.name3}';
+      '${enclosingElement.name}.${element.name}';
 
   @override
   String get nameWithGenerics {
-    var constructorName = element.name3!;
+    var constructorName = element.name!;
     if (constructorName == 'new') {
       return '${enclosingElement.name}$genericParameters';
     }
@@ -113,7 +113,7 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
 
   String? get shortName {
     if (name.contains('.')) {
-      return name.substring(element.enclosingElement2.name3!.length + 1);
+      return name.substring(element.enclosingElement.name!.length + 1);
     } else {
       return name;
     }
@@ -122,11 +122,11 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
   @override
   late final Map<String, CommentReferable> referenceChildren = () {
     // Find the element that [parameter] is _really_ referring to.
-    Element2? dereferenceParameter(FormalParameterElement? parameter) =>
+    Element? dereferenceParameter(FormalParameterElement? parameter) =>
         switch (parameter) {
-          FieldFormalParameterElement2() => parameter.field2,
-          SuperFormalParameterElement2() =>
-            dereferenceParameter(parameter.superConstructorParameter2),
+          FieldFormalParameterElement() => parameter.field,
+          SuperFormalParameterElement() =>
+            dereferenceParameter(parameter.superConstructorParameter),
           _ => parameter
         };
 
@@ -142,5 +142,5 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
 
   @override
   String get referenceName =>
-      isUnnamedConstructor ? enclosingElement.name : element.name3!;
+      isUnnamedConstructor ? enclosingElement.name : element.name!;
 }

lib/src/model/container.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/scope.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/model.dart';
@@ -32,7 +32,7 @@ abstract class Container extends ModelElement
   Container(super.library, super.packageGraph);
 
   @override
-  Element2 get element;
+  Element get element;
 
   // TODO(jcollins-g): Implement a ContainerScope that flattens supertypes?
   @override
@@ -41,20 +41,20 @@ abstract class Container extends ModelElement
   @override
   bool get hasParameters => false;
 
-  bool get isExtension => element is ExtensionElement2;
+  bool get isExtension => element is ExtensionElement;
 
   /// Whether this is an enum.
-  bool get isEnum => element is EnumElement2;
+  bool get isEnum => element is EnumElement;
 
   /// Whether this is an interface (e.g. class, enum, mixin, or extension type).
-  bool get isInterface => element is InterfaceElement2;
+  bool get isInterface => element is InterfaceElement;
 
   /// Whether this is a mixin.
-  bool get isMixin => element is MixinElement2;
+  bool get isMixin => element is MixinElement;
 
   /// Whether this container represents the Object class from 'dart:core'.
   bool get isDartCoreObject =>
-      element.name3 == 'Object' && element.library2?.name3 == 'dart.core';
+      element.name == 'Object' && element.library?.name == 'dart.core';
 
   /// The model elements of all of the members of this container, including
   /// declared and inherited ones.
@@ -158,9 +158,9 @@ abstract class Container extends ModelElement
 
   /// This container might be canonical for elements it does not contain.
   /// See [Inheritable.canonicalEnclosingContainer].
-  bool containsElement(Element2? element) => _allElements.contains(element);
+  bool containsElement(Element? element) => _allElements.contains(element);
 
-  late final Set<Element2> _allElements =
+  late final Set<Element> _allElements =
       allModelElements.map((e) => e.element).toSet();
 
   bool get hasPublicStaticFields => staticFields.any((e) => e.isPublic);

lib/src/model/container_member.dart

@@ -29,7 +29,7 @@ mixin ContainerMember on ModelElement {
   @protected
   @visibleForTesting
   late final Container definingEnclosingContainer =
-      getModelForElement(element.enclosingElement2!) as Container;
+      getModelForElement(element.enclosingElement!) as Container;
 
   @override
   Set<Attribute> get attributes => {

lib/src/model/documentation_comment.dart

@@ -5,7 +5,7 @@
 /// @docImport 'package:dartdoc/src/model/package_graph.dart';
 library;
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:args/args.dart';
 import 'package:crypto/crypto.dart' as crypto;
 import 'package:dartdoc/src/model/documentable.dart';
@@ -41,7 +41,7 @@ final _htmlInjectRegExp = RegExp(r'<dartdoc-html>([a-f0-9]+)</dartdoc-html>');
 mixin DocumentationComment
     implements Documentable, Warnable, Locatable, SourceCode {
   @override
-  Element2 get element;
+  Element get element;
 
   List<DocumentationComment>? _documentationFrom;
 
@@ -74,9 +74,7 @@ mixin DocumentationComment
 
   /// Whether `this` has a synthetic/inherited or local documentation comment,
   /// and false otherwise.
-  bool get hasDocumentationComment =>
-      element is Annotatable &&
-      (element as Annotatable).documentationComment != null;
+  bool get hasDocumentationComment => element.documentationComment != null;
 
   /// Whether the raw documentation comment is considered to be 'nodoc', an
   /// attribute indicating that any documentation should not be included in