Merge branch 'main' into migrate-contsructor

srawlins · srawlins · commit 1694f6be04ea · 2025-02-05T07:34:16.000-08:00
diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
@@ -214,7 +214,7 @@ mixin Aliased implements ElementType {
   bool get isTypedef => true;
 
   late final ModelElement aliasElement =
-      ModelElement.forElement2(typeAliasElement2, packageGraph);
+      ModelElement.forElement(typeAliasElement2, packageGraph);
 
   late final List<ElementType> aliasArguments = type.alias!.typeArguments
       .map((f) => getTypeFor(f, library))
@@ -322,7 +322,7 @@ abstract class DefinedElementType extends ElementType {
   @internal
   @override
   CommentReferable get definingCommentReferable =>
-      ModelElement.forElement2(modelElement.element2, packageGraph);
+      ModelElement.forElement(modelElement.element2, packageGraph);
 }
 
 /// Any callable [ElementType] will mix-in this class, whether anonymous or not,
diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
@@ -13405,34 +13405,6 @@ class _Renderer_Library extends RendererBase<Library> {
                   );
                 },
               ),
-              'compilationUnitElement': Property(
-                getValue: (CT_ c) => c.compilationUnitElement,
-                renderVariable:
-                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
-                        self.renderSimpleVariable(
-                          c,
-                          remainingNames,
-                          'CompilationUnitElement',
-                        ),
-
-                isNullValue: (CT_ c) => false,
-
-                renderValue: (
-                  CT_ c,
-                  RendererBase<CT_> r,
-                  List<MustachioNode> ast,
-                  StringSink sink,
-                ) {
-                  renderSimple(
-                    c.compilationUnitElement,
-                    ast,
-                    r.template,
-                    sink,
-                    parent: r,
-                    getters: _invisibleGetters['CompilationUnitElement']!,
-                  );
-                },
-              ),
               'constants': Property(
                 getValue: (CT_ c) => c.constants,
                 renderVariable:
@@ -14272,6 +14244,34 @@ class _Renderer_Library extends RendererBase<Library> {
                   );
                 },
               ),
+              'unitElement': Property(
+                getValue: (CT_ c) => c.unitElement,
+                renderVariable:
+                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
+                        self.renderSimpleVariable(
+                          c,
+                          remainingNames,
+                          'LibraryFragment',
+                        ),
+
+                isNullValue: (CT_ c) => false,
+
+                renderValue: (
+                  CT_ c,
+                  RendererBase<CT_> r,
+                  List<MustachioNode> ast,
+                  StringSink sink,
+                ) {
+                  renderSimple(
+                    c.unitElement,
+                    ast,
+                    r.template,
+                    sink,
+                    parent: r,
+                    getters: _invisibleGetters['LibraryFragment']!,
+                  );
+                },
+              ),
             },
           )
           as Map<String, Property<CT_>>;
@@ -16916,34 +16916,6 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
                   );
                 },
               ),
-              'compilationUnitElement': Property(
-                getValue: (CT_ c) => c.compilationUnitElement,
-                renderVariable:
-                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
-                        self.renderSimpleVariable(
-                          c,
-                          remainingNames,
-                          'CompilationUnitElement',
-                        ),
-
-                isNullValue: (CT_ c) => false,
-
-                renderValue: (
-                  CT_ c,
-                  RendererBase<CT_> r,
-                  List<MustachioNode> ast,
-                  StringSink sink,
-                ) {
-                  renderSimple(
-                    c.compilationUnitElement,
-                    ast,
-                    r.template,
-                    sink,
-                    parent: r,
-                    getters: _invisibleGetters['CompilationUnitElement']!,
-                  );
-                },
-              ),
               'config': Property(
                 getValue: (CT_ c) => c.config,
                 renderVariable:
@@ -18073,6 +18045,34 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
                   );
                 },
               ),
+              'unitElement': Property(
+                getValue: (CT_ c) => c.unitElement,
+                renderVariable:
+                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
+                        self.renderSimpleVariable(
+                          c,
+                          remainingNames,
+                          'LibraryFragment',
+                        ),
+
+                isNullValue: (CT_ c) => false,
+
+                renderValue: (
+                  CT_ c,
+                  RendererBase<CT_> r,
+                  List<MustachioNode> ast,
+                  StringSink sink,
+                ) {
+                  renderSimple(
+                    c.unitElement,
+                    ast,
+                    r.template,
+                    sink,
+                    parent: r,
+                    getters: _invisibleGetters['LibraryFragment']!,
+                  );
+                },
+              ),
             },
           )
           as Map<String, Property<CT_>>;
@@ -20413,7 +20413,7 @@ class _Renderer_Package extends RendererBase<Package> {
   }
 }
 
-String renderError(PackageTemplateData context, Template template) {
+String renderIndex(PackageTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_PackageTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
@@ -20770,7 +20770,7 @@ class _Renderer_PackageTemplateData extends RendererBase<PackageTemplateData> {
   }
 }
 
-String renderIndex(PackageTemplateData context, Template template) {
+String renderError(PackageTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_PackageTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
@@ -26256,28 +26256,6 @@ const _invisibleGetters = {
     'referenceParents',
     'scope',
   },
-  'CompilationUnitElement': {
-    'accessibleExtensions',
-    'accessors',
-    'classes',
-    'enclosingElement3',
-    'enums',
-    'extensionTypes',
-    'extensions',
-    'functions',
-    'hashCode',
-    'libraryExports',
-    'libraryImportPrefixes',
-    'libraryImports',
-    'lineInfo',
-    'mixins',
-    'parts',
-    'runtimeType',
-    'scope',
-    'session',
-    'topLevelVariables',
-    'typeAliases',
-  },
   'Constructable': {
     'constructors',
     'extraReferenceChildren',
@@ -26837,6 +26815,33 @@ const _invisibleGetters = {
     'typeSystem',
     'uri',
   },
+  'LibraryFragment': {
+    'accessibleExtensions2',
+    'classes2',
+    'element',
+    'enclosingFragment',
+    'enums2',
+    'extensionTypes2',
+    'extensions2',
+    'functions2',
+    'getters',
+    'hashCode',
+    'importedLibraries2',
+    'libraryExports2',
+    'libraryImports2',
+    'lineInfo',
+    'mixins2',
+    'nextFragment',
+    'partIncludes',
+    'prefixes',
+    'previousFragment',
+    'runtimeType',
+    'scope',
+    'setters',
+    'source',
+    'topLevelVariables2',
+    'typeAliases2',
+  },
   'List': {'hashCode', 'length', 'reversed', 'runtimeType'},
   'Locatable': {
     'documentationFrom',
diff --git a/lib/src/model/accessor.dart b/lib/src/model/accessor.dart
@@ -61,7 +61,7 @@ class Accessor extends ModelElement {
     if (!isSynthetic) {
       return super.sourceCode;
     }
-    var modelNode = packageGraph.getModelNodeFor2(definingCombo.element2);
+    var modelNode = packageGraph.getModelNodeFor(definingCombo.element2);
     return modelNode == null
         ? ''
         : const HtmlEscape().convert(modelNode.sourceCode);
diff --git a/lib/src/model/canonicalization.dart b/lib/src/model/canonicalization.dart
@@ -58,7 +58,7 @@ Library? canonicalLibraryCandidate(ModelElement modelElement) {
   }
 
   var topLevelModelElement =
-      ModelElement.forElement2(topLevelElement, modelElement.packageGraph);
+      ModelElement.forElement(topLevelElement, modelElement.packageGraph);
 
   return _Canonicalization(topLevelModelElement)
       .canonicalLibraryCandidate(candidateLibraries);
diff --git a/lib/src/model/constructor.dart b/lib/src/model/constructor.dart
@@ -5,6 +5,8 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/source/line_info.dart';
+// ignore: implementation_imports
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/kind.dart';
@@ -14,9 +16,7 @@ import 'package:dartdoc/src/model_utils.dart';
 class Constructor extends ModelElement with ContainerMember, TypeParameters {
   @override
   // ignore: analyzer_use_new_elements
-  ConstructorElement get element =>
-      // ignore: analyzer_use_new_elements
-      element2.firstFragment as ConstructorElement;
+  ConstructorElement get element => element2.asElement;
 
   @override
   final ConstructorElement2 element2;
diff --git a/lib/src/model/extension.dart b/lib/src/model/extension.dart
@@ -110,12 +110,12 @@ class Extension extends Container {
     ContainerAccessor? getter, setter;
     final fieldGetter = field.getter2;
     if (fieldGetter != null) {
-      getter = ModelElement.for2_(fieldGetter, library, packageGraph,
+      getter = ModelElement.for_(fieldGetter, library, packageGraph,
           enclosingContainer: this) as ContainerAccessor;
     }
     final fieldSetter = field.setter2;
     if (fieldSetter != null) {
-      setter = ModelElement.for2_(fieldSetter, library, packageGraph,
+      setter = ModelElement.for_(fieldSetter, library, packageGraph,
           enclosingContainer: this) as ContainerAccessor;
     }
     return getModelForPropertyInducingElement(field.asElement, library,
diff --git a/lib/src/model/extension_type.dart b/lib/src/model/extension_type.dart
@@ -16,16 +16,15 @@ import 'package:meta/meta.dart';
 
 class ExtensionType extends InheritingContainer with Constructable {
   @override
-  final ExtensionTypeElement element;
+  ExtensionTypeElement get element => element2.asElement;
 
   @override
-  ExtensionTypeElement2 get element2 =>
-      element.asElement2 as ExtensionTypeElement2;
+  final ExtensionTypeElement2  element2;
 
   late final ElementType representationType =
       getTypeFor(element.representation.type, library);
 
-  ExtensionType(this.element, super.library, super.packageGraph);
+  ExtensionType(this.element2, super.library, super.packageGraph);
 
   @override
   Library get enclosingElement => library;
diff --git a/lib/src/model/field.dart b/lib/src/model/field.dart
@@ -42,7 +42,7 @@ class Field extends ModelElement
     this.setter,
   )   : isInherited = false,
         enclosingElement =
-            ModelElement.for_(element.enclosingElement3, library, packageGraph)
+            ModelElement.for_(element.asElement2.enclosingElement2, library, packageGraph)
                 as Container,
         assert(getter != null || setter != null) {
     getter?.enclosingCombo = this;
@@ -58,34 +58,36 @@ class Field extends ModelElement
   )   : element = element2.asElement as FieldElement,
         isInherited = false,
         enclosingElement =
-            ModelElement.for2_(element2.enclosingElement2!, library, packageGraph)
+            ModelElement.for_(element2.enclosingElement2!, library, packageGraph)
                 as Container,
         assert(getter != null || setter != null) {
     getter?.enclosingCombo = this;
     setter?.enclosingCombo = this;
   }
 
   Field.providedByExtension(
-    this.element,
+    Element2 element2,
     this.enclosingElement,
     super.library,
     super.packageGraph,
     this.getter,
     this.setter,
-  )   : isInherited = false,
+  )   : element = element2.asElement as FieldElement,
+        isInherited = false,
         assert(getter != null || setter != null) {
     getter?.enclosingCombo = this;
     setter?.enclosingCombo = this;
   }
 
   Field.inherited(
-    this.element,
+    Element2 element2,
     this.enclosingElement,
     super.library,
     super.packageGraph,
     this.getter,
     this.setter,
-  )   : isInherited = true,
+  )   : element = element2.asElement as FieldElement,
+        isInherited = true,
         assert(getter != null || setter != null) {
     // Can't set `isInherited` to true if this is the defining element, because
     // that would mean it isn't inherited.
diff --git a/lib/src/model/library.dart b/lib/src/model/library.dart
@@ -120,8 +120,8 @@ class Library extends ModelElement
   }
 
   @override
-  CompilationUnitElement get compilationUnitElement =>
-      element.definingCompilationUnit;
+  LibraryFragment get unitElement =>
+      element2.library2.firstFragment;
 
   @override
 
diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart
diff --git a/lib/src/model/nameable.dart b/lib/src/model/nameable.dart
diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class Accessor extends ModelElement {`
`61`	`61`	`if (!isSynthetic) {`
`62`	`62`	`return super.sourceCode;`
`63`	`63`	`}`
`64`		`- var modelNode = packageGraph.getModelNodeFor2(definingCombo.element2);`
	`64`	`+ var modelNode = packageGraph.getModelNodeFor(definingCombo.element2);`
`65`	`65`	`return modelNode == null`
`66`	`66`	`? ''`
`67`	`67`	`: const HtmlEscape().convert(modelNode.sourceCode);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ Library? canonicalLibraryCandidate(ModelElement modelElement) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`var topLevelModelElement =`
`61`		`- ModelElement.forElement2(topLevelElement, modelElement.packageGraph);`
	`61`	`+ ModelElement.forElement(topLevelElement, modelElement.packageGraph);`
`62`	`62`
`63`	`63`	`return _Canonicalization(topLevelModelElement)`
`64`	`64`	`.canonicalLibraryCandidate(candidateLibraries);`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ class Library extends ModelElement`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`@override`
`123`		`- CompilationUnitElement get compilationUnitElement =>`
`124`		`- element.definingCompilationUnit;`
	`123`	`+ LibraryFragment get unitElement =>`
	`124`	`+ element2.library2.firstFragment;`
`125`	`125`
`126`	`126`	`@override`
`127`	`127`