Skip to content

Rename DartDocResolvedLibrary.element2 -> element #4004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2025
Merged

Rename DartDocResolvedLibrary.element2 -> element #4004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/src/model/library.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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,
);
Expand Down
10 changes: 5 additions & 5 deletions lib/src/model/package_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
}

Expand Down
8 changes: 4 additions & 4 deletions lib/src/model/package_graph.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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,
));
Expand Down