all

Author: fshcheglov

lib/src/model/parameter.dart

@@ -2,28 +2,28 @@
 // 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';
+
 // ignore: implementation_imports
-import 'package:analyzer/src/dart/element/member.dart' show ParameterMember;
+import 'package:analyzer/src/dart/element/member.dart'
+    show SubstitutedFormalParameterElementImpl;
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/kind.dart';
 import 'package:dartdoc/src/model/model.dart';
 
 class Parameter extends ModelElement with HasNoPage {
-
   @override
   final FormalParameterElement element;
 
   Parameter(this.element, super.library, super.packageGraph,
-      {ParameterMember? super.originalMember});
+      {SubstitutedFormalParameterElementImpl? super.originalMember});
 
-  String? get defaultValue =>
-      hasDefaultValue ? element.defaultValueCode : null;
+  String? get defaultValue => hasDefaultValue ? element.defaultValueCode : null;
 
   @override
   ModelElement? get enclosingElement {
-    final enclosingElement = element.enclosingElement2;
+    final enclosingElement = element.enclosingElement;
     return enclosingElement == null
         ? null
         : getModelFor(enclosingElement, library);
@@ -39,21 +39,21 @@ class Parameter extends ModelElement with HasNoPage {
 
   @override
   String get htmlId {
-    final enclosingElement = element.enclosingElement2;
+    final enclosingElement = element.enclosingElement;
     if (enclosingElement == null) {
       return 'param-$name';
     }
     var enclosingName = enclosingElement.lookupName;
     if (enclosingName == 'new') {
       enclosingName = '';
     }
-    if (enclosingElement is GenericFunctionTypeElement2) {
+    if (enclosingElement is GenericFunctionTypeElement) {
       // TODO(jcollins-g): Drop when GenericFunctionTypeElement populates
       // name. Also, allowing null here is allowed as a workaround for
       // dart-lang/sdk#32005.
-      for (Element2 e = enclosingElement;
-          e.enclosingElement2 != null;
-          e = e.enclosingElement2!) {
+      for (Element e = enclosingElement;
+          e.enclosingElement != null;
+          e = e.enclosingElement!) {
         enclosingName = e.lookupName;
         if (enclosingName != null && enclosingName.isNotEmpty) break;
       }
@@ -101,8 +101,8 @@ class Parameter extends ModelElement with HasNoPage {
   }
 
   @override
-  ParameterMember? get originalMember =>
-      super.originalMember as ParameterMember?;
+  SubstitutedFormalParameterElementImpl? get originalMember =>
+      super.originalMember as SubstitutedFormalParameterElementImpl?;
 
   late final ElementType modelType =
       getTypeFor((originalMember ?? element).type, library);

lib/src/model/prefix.dart

@@ -2,22 +2,22 @@
 // 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/kind.dart';
 import 'package:dartdoc/src/model/model.dart';
 
-/// Represents a [PrefixElement2] for dartdoc.
+/// Represents a [PrefixElement] for dartdoc.
 ///
 /// Like [Parameter], it doesn't have doc pages, but participates in lookups.
 /// Forwards to its referenced library if referred to directly.
 class Prefix extends ModelElement with HasNoPage {
   @override
-  final PrefixElement2 element;
+  final PrefixElement element;
 
   /// [library] is the library the prefix is defined in, not the [Library]
-  /// referred to by the [PrefixElement2].
+  /// referred to by the [PrefixElement].
   Prefix(this.element, super.library, super.packageGraph);
 
   @override
@@ -28,13 +28,13 @@ class Prefix extends ModelElement with HasNoPage {
   late final Library associatedLibrary =
       getModelForElement(_importedLibraryElement) as Library;
 
-  LibraryElement2 get _importedLibraryElement {
+  LibraryElement get _importedLibraryElement {
     final importLists =
-        library.element.fragments.map((fragment) => fragment.libraryImports2);
+        library.element.fragments.map((fragment) => fragment.libraryImports);
     var libraryImport = importLists
         .expand((import) => import)
-        .firstWhere((i) => i.prefix2?.element == element);
-    var importedLibrary = libraryImport.importedLibrary2;
+        .firstWhere((i) => i.prefix?.element == element);
+    var importedLibrary = libraryImport.importedLibrary;
     if (importedLibrary == null) {
       var message = 'Unexpected null LibraryElement2 for imported library at '
           '${library.element.firstFragment.source.uri}, at offset '

lib/src/model/top_level_variable.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/attribute.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/kind.dart';
@@ -13,7 +13,7 @@ class TopLevelVariable extends ModelElement
     with GetterSetterCombo, Categorization {
 
   @override
-  final TopLevelVariableElement2 element;
+  final TopLevelVariableElement element;
 
   @override
   final Accessor? getter;

lib/src/model/type_parameter.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/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/kind.dart';
@@ -11,13 +11,13 @@ import 'package:dartdoc/src/model/model.dart';
 class TypeParameter extends ModelElement with HasNoPage {
 
   @override
-  final TypeParameterElement2 element;
+  final TypeParameterElement element;
 
   TypeParameter(this.element, super.library, super.packageGraph);
 
   @override
   ModelElement get enclosingElement =>
-      getModelFor(element.enclosingElement2!, library);
+      getModelFor(element.enclosingElement!, library);
 
   /// [TypeParameter]s don't have documentation pages, and don't link to the
   /// element on which they are declared.
@@ -39,13 +39,13 @@ class TypeParameter extends ModelElement with HasNoPage {
 
   @override
   String get name => element.bound != null
-      ? '${element.name3} extends ${boundType!.nameWithGenerics}'
-      : element.name3!;
+      ? '${element.name} extends ${boundType!.nameWithGenerics}'
+      : element.name!;
 
   @override
   String get linkedName => element.bound != null
-      ? '${element.name3} extends ${boundType!.linkedName}'
-      : element.name3!;
+      ? '${element.name} extends ${boundType!.linkedName}'
+      : element.name!;
 
   @override
   late final Map<String, CommentReferable> referenceChildren = () {
@@ -58,7 +58,7 @@ class TypeParameter extends ModelElement with HasNoPage {
   Iterable<CommentReferable> get referenceParents => [enclosingElement];
 
   @override
-  String get referenceName => element.name3!;
+  String get referenceName => element.name!;
 }
 
 /// A mixin for [ModelElement]s which have type parameters.

lib/src/model/typedef.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/type.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
@@ -13,7 +13,7 @@ abstract class Typedef extends ModelElement
     with TypeParameters, Categorization {
 
   @override
-  final TypeAliasElement2 element;
+  final TypeAliasElement element;
 
   Typedef(this.element, super.library, super.packageGraph);
 
@@ -62,7 +62,7 @@ abstract class Typedef extends ModelElement
   Kind get kind => Kind.typedef;
 
   @override
-  List<TypeParameter> get typeParameters => element.typeParameters2
+  List<TypeParameter> get typeParameters => element.typeParameters
       .map((f) => getModelFor(f, library) as TypeParameter)
       .toList(growable: false);
 
@@ -130,7 +130,7 @@ class FunctionTypedef extends Typedef {
         'Expected callable but: ${element.runtimeType} is FunctionTypedElement '
         '|| (${element.runtimeType} is TypeAliasElement && '
         '${element.aliasedType.runtimeType} is FunctionType) is not true for '
-        '"${element.name3}" in "${element.library2}"');
+        '"${element.name}" in "${element.library}"');
   }
 
   @override

lib/src/model_utils.dart

@@ -4,7 +4,7 @@
 
 import 'dart:io' show Platform;
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/failure.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:glob/glob.dart';
@@ -52,9 +52,9 @@ Iterable<T> filterHasCanonical<T extends ModelElement>(
   return maybeHasCanonicalItems.where((me) => me.canonicalModelElement != null);
 }
 
-extension ElementExtension on Element2 {
+extension ElementExtension on Element {
   bool get hasPrivateName {
-    final name = name3;
+    final name = this.name;
     if (name == null) return false;
 
     if (name.startsWith('_')) {
@@ -65,8 +65,8 @@ extension ElementExtension on Element2 {
 
     // GenericFunctionTypeElements have the name we care about in the enclosing
     // element.
-    if (self is GenericFunctionTypeElement2) {
-      var enclosingElementName = self.enclosingElement2?.name3;
+    if (self is GenericFunctionTypeElement) {
+      var enclosingElementName = self.enclosingElement?.name;
       if (enclosingElementName != null &&
           enclosingElementName.startsWith('_')) {
         return true;

lib/src/mustachio/annotations.dart

@@ -5,7 +5,7 @@
 // See the Mustachio README at tool/mustachio/README.md for high-level
 // documentation.
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:meta/meta.dart';
 
@@ -89,5 +89,5 @@ class RendererSpec {
     this.standardHtmlTemplate,
   );
 
-  InterfaceElement2 get contextElement => contextType.element3;
+  InterfaceElement get contextElement => contextType.element;
 }

lib/src/package_meta.dart

@@ -4,9 +4,10 @@
 
 import 'dart:io' show Platform;
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
+
 // ignore: implementation_imports
 import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
 import 'package:dartdoc/src/failure.dart';
@@ -49,13 +50,13 @@ final PackageMetaProvider pubPackageMetaProvider = PackageMetaProvider(
 /// Sets the supported way of constructing [PackageMeta] objects.
 ///
 /// These objects can be constructed from a filename, a directory
-/// or a [LibraryElement2]. We allow different dartdoc implementations to
+/// or a [LibraryElement]. We allow different dartdoc implementations to
 /// provide their own [PackageMeta] types.
 ///
 /// By using a different provider, these implementations can control how
 /// [PackageMeta] objects are built.
 class PackageMetaProvider {
-  final PackageMeta? Function(LibraryElement2, String, ResourceProvider)
+  final PackageMeta? Function(LibraryElement, String, ResourceProvider)
       _fromElement;
   final PackageMeta? Function(String, ResourceProvider) _fromFilename;
   final PackageMeta? Function(Folder, ResourceProvider) _fromDir;
@@ -75,9 +76,11 @@ class PackageMetaProvider {
     this.defaultSdk,
   });
 
-  PackageMeta? fromElement(LibraryElement2 library, String s) =>
+  PackageMeta? fromElement(LibraryElement library, String s) =>
       _fromElement(library, s, resourceProvider);
+
   PackageMeta? fromFilename(String s) => _fromFilename(s, resourceProvider);
+
   PackageMeta? fromDir(Folder dir) => _fromDir(dir, resourceProvider);
 }
 
@@ -183,7 +186,7 @@ abstract class PubPackageMeta extends PackageMeta {
   }
 
   /// Use this instead of [fromDir] where possible.
-  static PackageMeta? fromElement(LibraryElement2 libraryElement, String sdkDir,
+  static PackageMeta? fromElement(LibraryElement libraryElement, String sdkDir,
       ResourceProvider resourceProvider) {
     if (libraryElement.isInSdk) {
       return PubPackageMeta.fromDir(

lib/src/type_utils.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/type.dart';
 
 extension DartTypeExtension on DartType {
@@ -11,12 +11,12 @@ extension DartTypeExtension on DartType {
   ///
   /// For example, the documentable element of [DynamicType] is `null`, as there
   /// is no documentation for `dynamic` which we can link to.
-  TypeDefiningElement2? get documentableElement2 {
+  TypeDefiningElement? get documentableElement2 {
     final self = this;
     return switch (self) {
-      InterfaceType() => self.element3,
-      NeverType() => self.element3 as TypeDefiningElement2,
-      TypeParameterType() => self.element3,
+      InterfaceType() => self.element,
+      NeverType() => self.element as TypeDefiningElement,
+      TypeParameterType() => self.element,
       _ => null
     };
   }

lib/src/warnings.dart

@@ -5,7 +5,7 @@
 import 'dart:io';
 import 'dart:math' as math;
 
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:collection/collection.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
@@ -95,7 +95,7 @@ List<DartdocOption<Object?>> createPackageWarningOptions(
 /// Something that package warnings can be reported on. Optionally associated
 /// with an analyzer [element].
 mixin Warnable implements CommentReferable, Documentable, Locatable {
-  Element2? get element;
+  Element? get element;
 
   void warn(
     PackageWarning kind, {
@@ -462,7 +462,7 @@ class PackageWarningOptions {
 }
 
 class PackageWarningCounter {
-  final Map<Element2?, Map<PackageWarning, Set<String>>> _countedWarnings = {};
+  final Map<Element?, Map<PackageWarning, Set<String>>> _countedWarnings = {};
   final _items = <Jsonable>[];
   final _displayedWarningCounts = <PackageWarning, int>{};
   final PackageGraph packageGraph;
@@ -479,7 +479,7 @@ class PackageWarningCounter {
 
   /// An unmodifiable map view of all counted warnings related by their element,
   /// warning type, and message.
-  UnmodifiableMapView<Element2?, Map<PackageWarning, Set<String>>>
+  UnmodifiableMapView<Element?, Map<PackageWarning, Set<String>>>
       get countedWarnings => UnmodifiableMapView(_countedWarnings);
 
   PackageWarningCounter(this.packageGraph);