100

Author: fshcheglov

lib/src/model/model_function.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';
@@ -16,7 +16,7 @@ class ModelFunction extends ModelFunctionTyped with Categorization {
   bool get isStatic => element.isStatic;
 
   @override
-  String get name => element.name3 ?? '';
+  String get name => element.name ?? '';
 
   @override
   TopLevelFunctionElement get element =>
@@ -25,22 +25,22 @@ class ModelFunction extends ModelFunctionTyped with Categorization {
   bool get isAsynchronous => element.firstFragment.isAsynchronous;
 }
 
-/// A [ModelElement] for a [FunctionTypedElement2] that is part of an
+/// A [ModelElement] for a [FunctionTypedElement] that is part of an
 /// explicit typedef.
 class ModelFunctionTypedef extends ModelFunctionTyped {
   ModelFunctionTypedef(super.element, super.library, super.packageGraph);
 
   @override
-  String get name => element.enclosingElement2!.name3!;
+  String get name => element.enclosingElement!.name!;
 }
 
 class ModelFunctionTyped extends ModelElement with TypeParameters {
   @override
-  final FunctionTypedElement2 element;
+  final FunctionTypedElement element;
 
   @override
   late final List<TypeParameter> typeParameters = [
-    for (var p in element.typeParameters2)
+    for (var p in element.typeParameters)
       getModelFor(p, library) as TypeParameter,
   ];
 

lib/src/model/model_node.dart

@@ -7,13 +7,13 @@ import 'dart:convert';
 import 'package:analyzer/dart/analysis/analysis_context.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:meta/meta.dart';
 
 /// Stripped down information derived from [AstNode] containing only information
 /// needed to resurrect the source code of [_element].
 class ModelNode {
-  final Element2 _element;
+  final Element _element;
   final AnalysisContext _analysisContext;
   final int _sourceEnd;
   final int _sourceOffset;
@@ -23,7 +23,7 @@ class ModelNode {
 
   factory ModelNode(
     AstNode? sourceNode,
-    Element2 element,
+    Element element,
     AnalysisContext analysisContext, {
     CommentData? commentData,
   }) {
@@ -115,7 +115,7 @@ class CommentDocImportData {
 /// Comment reference data is not available on the analyzer's Element model, so
 /// we store it in instances of this class after resolving libraries.
 class CommentReferenceData {
-  final Element2 element;
+  final Element element;
   final String name;
   final int offset;
   final int length;

lib/src/model/nameable.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' show DartType;
 import 'package:collection/collection.dart';
 import 'package:dartdoc/src/element_type.dart';
@@ -54,7 +54,7 @@ mixin Nameable {
   ///
   /// A convenience method for [ModelElement.for_], see its documentation.
   ModelElement getModelFor(
-    Element2 element,
+    Element element,
     Library library, {
     Container? enclosingContainer,
   }) =>
@@ -69,7 +69,7 @@ mixin Nameable {
   ///
   /// A convenience method for [ModelElement.forElement], see its
   /// documentation.
-  ModelElement getModelForElement(Element2 element) =>
+  ModelElement getModelForElement(Element element) =>
       ModelElement.forElement(element, packageGraph);
 
   /// Returns the [ModelElement] for [element], instantiating it if needed.
@@ -80,7 +80,7 @@ mixin Nameable {
   // immediately before calling this method, and I imagine could instead just
   // call `getModelFor`.
   ModelElement getModelForPropertyInducingElement(
-    PropertyInducingElement2 element,
+    PropertyInducingElement element,
     Library library, {
     required Accessor? getter,
     required Accessor? setter,

lib/src/model/never.dart

@@ -2,15 +2,15 @@
 // 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/comment_referable.dart';
 import 'package:dartdoc/src/model/kind.dart';
 import 'package:dartdoc/src/model/model.dart';
 
 class NeverType extends ModelElement with HasNoPage {
 
   @override
-  final Element2 element;
+  final Element element;
 
   NeverType(this.element, PackageGraph packageGraph)
       : super(Library.sentinel, packageGraph);

lib/src/model/operator.dart

@@ -4,7 +4,7 @@
 
 // ignore: implementation_imports
 import 'package:analyzer/src/dart/element/member.dart'
-    show ExecutableMember, Member;
+    show SubstitutedExecutableElementImpl, SubstitutedElementImpl;
 import 'package:dartdoc/src/comment_references/parser.dart';
 import 'package:dartdoc/src/model/model.dart';
 
@@ -16,17 +16,17 @@ class Operator extends Method {
     super.enclosingContainer,
     super.library,
     super.packageGraph, {
-    Member? originalMember,
+        SubstitutedElementImpl? originalMember,
   }) : super.providedByExtension(
-            originalMember: originalMember as ExecutableMember?);
+            originalMember: originalMember as SubstitutedExecutableElementImpl?);
 
   Operator.inherited(
     super.element,
     super.enclosingContainer,
     super.library,
     super.packageGraph, {
-    Member? originalMember,
-  }) : super.inherited(originalMember: originalMember as ExecutableMember?);
+        SubstitutedElementImpl? originalMember,
+  }) : super.inherited(originalMember: originalMember as SubstitutedExecutableElementImpl?);
 
   @override
   String get fullyQualifiedName =>

lib/src/model/package.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/dartdoc_options.dart';
 import 'package:dartdoc/src/io_utils.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
@@ -374,7 +374,7 @@ class Package extends LibraryContainer
   final PackageMeta packageMeta;
 
   @override
-  Element2? get element => null;
+  Element? get element => null;
 
   @override
   List<String> get containerOrder => config.packageOrder;

lib/src/model/package_builder.dart

@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:analyzer/dart/analysis/analysis_context.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 // ignore: implementation_imports
 import 'package:analyzer/src/context/builder.dart' show EmbedderYamlLocator;
@@ -215,10 +215,10 @@ class PubPackageBuilder implements PackageBuilder {
   /// Discovers and resolves libraries, invoking [addLibrary] with each result.
   ///
   /// Uses [processedLibraries] to prevent calling [addLibrary] more than once
-  /// with the same [LibraryElement2]. Adds each [LibraryElement2] found to
+  /// with the same [LibraryElement]. Adds each [LibraryElement] found to
   /// [processedLibraries].
   Future<void> _discoverLibraries(PackageGraph uninitializedPackageGraph,
-      Set<LibraryElement2> processedLibraries, Set<String> files) async {
+      Set<LibraryElement> processedLibraries, Set<String> files) async {
     files = {...files};
     // Discover Dart libraries in a loop. In each iteration of the loop, we take
     // a set of files (starting with the ones passed into the function), resolve
@@ -435,7 +435,7 @@ class PubPackageBuilder implements PackageBuilder {
     var files = await _getFilesToDocument();
 
     logInfo('Discovering libraries...');
-    var foundLibraries = <LibraryElement2>{};
+    var foundLibraries = <LibraryElement>{};
     await _discoverLibraries(
       uninitializedPackageGraph,
       foundLibraries,
@@ -447,9 +447,9 @@ class PubPackageBuilder implements PackageBuilder {
 
   /// Throws an exception if any configured-to-be-included files were not found
   /// while gathering libraries.
-  void _checkForMissingIncludedFiles(Set<LibraryElement2> foundLibraries) {
+  void _checkForMissingIncludedFiles(Set<LibraryElement> foundLibraries) {
     if (_config.include.isNotEmpty) {
-      var knownLibraryNames = foundLibraries.map((l) => l.name3);
+      var knownLibraryNames = foundLibraries.map((l) => l.name);
       var notFound = _config.include
           .difference(Set.of(knownLibraryNames))
           .difference(_config.exclude);
@@ -482,20 +482,20 @@ class PubPackageBuilder implements PackageBuilder {
 /// Contains the [ResolvedLibraryResult] and any additional information about
 /// the library.
 class DartDocResolvedLibrary {
-  final LibraryElement2 element;
+  final LibraryElement element;
   final List<CompilationUnit> units;
 
   DartDocResolvedLibrary(ResolvedLibraryResult result)
-      : element = result.element2,
+      : element = result.element,
         units = result.units.map((unit) => unit.unit).toList();
 }
 
 extension on Set<String> {
   /// Adds [element]'s path and all of its part files' paths to `this`, and
   /// recursively adds the paths of all imported and exported libraries.
   ///
-  /// [element] must be a [LibraryElement2].
-  void addFilesReferencedBy(LibraryElement2? element) {
+  /// [element] must be a [LibraryElement].
+  void addFilesReferencedBy(LibraryElement? element) {
     if (element == null) return;
 
     for (var fragment in element.fragments) {
@@ -509,13 +509,13 @@ extension on Set<String> {
     var path = fragment.source.fullName;
 
     if (add(path)) {
-      var libraryImports = fragment.libraryImports2;
+      var libraryImports = fragment.libraryImports;
       for (var import in libraryImports) {
-        addFilesReferencedBy(import.importedLibrary2);
+        addFilesReferencedBy(import.importedLibrary);
       }
-      var libraryExports = fragment.libraryExports2;
+      var libraryExports = fragment.libraryExports;
       for (var export in libraryExports) {
-        addFilesReferencedBy(export.exportedLibrary2);
+        addFilesReferencedBy(export.exportedLibrary);
       }
     }
   }