Merge branch 'main' into misc/utilize-sass-nesting-in-dartdoc-styles

dart-lang · Feb 19, 2025 · a52448f · a52448f
2 parents 0c80720 + 02cfbe1
commit a52448f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/lib/src/model/library.dart b/lib/src/model/library.dart
@@ -56,7 +56,7 @@ class Library extends ModelElement
       PackageGraph packageGraph, Package package) {
     packageGraph.gatherModelNodes(resolvedLibrary);
 
-    var libraryElement = resolvedLibrary.element2;
+    var libraryElement = resolvedLibrary.element;
 
     var localElements = <Element2>{
       ...libraryElement.firstFragment.getters.map((g) => g.element),
@@ -77,7 +77,7 @@ class Library extends ModelElement
       libraryElement,
       packageGraph,
       package,
-      resolvedLibrary.element2.firstFragment.source.uri.toString(),
+      resolvedLibrary.element.firstFragment.source.uri.toString(),
       localElements,
       exportedElements,
     );

diff --git a/lib/src/model/package_builder.dart b/lib/src/model/package_builder.dart
@@ -272,15 +272,15 @@ class PubPackageBuilder implements PackageBuilder {
           _knownParts.add(file);
           continue;
         }
-        newFiles.addFilesReferencedBy(resolvedLibrary.element2);
+        newFiles.addFilesReferencedBy(resolvedLibrary.element);
         for (var unit in resolvedLibrary.units) {
           newFiles.addFilesReferencedByFragment(unit.declaredFragment);
         }
-        if (processedLibraries.contains(resolvedLibrary.element2)) {
+        if (processedLibraries.contains(resolvedLibrary.element)) {
           continue;
         }
         uninitializedPackageGraph.addLibraryToGraph(resolvedLibrary);
-        processedLibraries.add(resolvedLibrary.element2);
+        processedLibraries.add(resolvedLibrary.element);
       }
       files.addAll(newFiles);
       var externals = _includedExternalsFrom(newFiles);
@@ -515,11 +515,11 @@ class PubPackageBuilder implements PackageBuilder {
 /// Contains the [ResolvedLibraryResult] and any additional information about
 /// the library.
 class DartDocResolvedLibrary {
-  final LibraryElement2 element2;
+  final LibraryElement2 element;
   final List<CompilationUnit> units;
 
   DartDocResolvedLibrary(ResolvedLibraryResult result)
-      : element2 = result.element2,
+      : element = result.element2,
         units = result.units.map((unit) => unit.unit).toList();
 }
 

diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart
@@ -92,7 +92,7 @@ class PackageGraph with CommentReferable, Nameable {
   /// span packages.
   void addLibraryToGraph(DartDocResolvedLibrary resolvedLibrary) {
     assert(!allLibrariesAdded);
-    var libraryElement2 = resolvedLibrary.element2;
+    var libraryElement2 = resolvedLibrary.element;
     var packageMeta =
         packageMetaProvider.fromElement(libraryElement2, config.sdkDir);
     if (packageMeta == null) {
@@ -107,7 +107,7 @@ class PackageGraph with CommentReferable, Nameable {
     }
     var package = Package.fromPackageMeta(packageMeta, this);
     var library = Library.fromLibraryResult(resolvedLibrary, this, package);
-    if (_shouldIncludeLibrary(resolvedLibrary.element2)) {
+    if (_shouldIncludeLibrary(resolvedLibrary.element)) {
       package.libraries.add(library);
     }
     _allLibraries[libraryElement2.firstFragment.source.fullName] = library;
@@ -222,10 +222,10 @@ class PackageGraph with CommentReferable, Nameable {
         // is no harm in grabbing ModelNode for each.
         var commentData = directive.documentationComment?.data;
         _modelNodes.putIfAbsent(
-            resolvedLibrary.element2,
+            resolvedLibrary.element,
             () => ModelNode(
                   directive,
-                  resolvedLibrary.element2,
+                  resolvedLibrary.element,
                   _analysisContext,
                   commentData: commentData,
                 ));