Elements. Use 'LibraryElement.uri' directly, not through 'firstFragment' or 'source'.

scheglov · Commit Queue · commit 327fcf0110dd · 2025-09-11T11:49:06.000-07:00
Change-Id: I69c76ff233efcebd93c0129b8c860b10521f2b48 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449068 Reviewed-by: Johnni Winther <johnniwinther@google.com> Reviewed-by: Samuel Rawlins <srawlins@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/tool/code_completion/relevance_metrics.dart b/pkg/analysis_server/tool/code_completion/relevance_metrics.dart
@@ -1130,7 +1130,7 @@ class RelevanceDataCollector extends RecursiveAstVisitor<void> {
     var enclosingElement = element.enclosingElement;
     if (!element.isStatic && enclosingElement is InterfaceElement) {
       var overriddenMembers = enclosingElement.getOverridden(
-        Name(fragment.libraryFragment.source.uri, element.name!),
+        Name(element.library.uri, element.name!),
       );
       if (overriddenMembers != null) {
         // Consider limiting this to the most immediate override. If the
diff --git a/pkg/analyzer/lib/src/dart/analysis/index.dart b/pkg/analyzer/lib/src/dart/analysis/index.dart
@@ -549,7 +549,7 @@ class _IndexAssembler {
     return unitMap.putIfAbsent(unitElement, () {
       assert(unitLibraryUris.length == unitUnitUris.length);
       int id = unitUnitUris.length;
-      unitLibraryUris.add(_getUriInfo(unitElement.library.source.uri));
+      unitLibraryUris.add(_getUriInfo(unitElement.library.uri));
       unitUnitUris.add(_getUriInfo(unitElement.source.uri));
       return id;
     });
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -6137,7 +6137,6 @@ class LibraryElementImpl extends ElementImpl
 
   @override
   bool get isInSdk {
-    var uri = _firstFragment.source.uri;
     return DartUriResolver.isDartUri(uri);
   }
 
diff --git a/pkg/analyzer/lib/src/dart/element/scope.dart b/pkg/analyzer/lib/src/dart/element/scope.dart
@@ -284,7 +284,7 @@ class LibraryDeclarations with _GettersAndSetters {
     library.classes.forEach(_addGetter);
 
     // Add implicit 'dart:core' declarations.
-    if ('${library.source.uri}' == 'dart:core') {
+    if ('${library.uri}' == 'dart:core') {
       _addGetter(DynamicElementImpl.instance);
       _addGetter(NeverElementImpl.instance);
     }
diff --git a/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart
@@ -158,7 +158,7 @@ class FunctionReferenceResolver {
       return null;
     }
     var callMethodName = Name(
-      _resolver.definingLibrary.source.uri,
+      _resolver.definingLibrary.uri,
       MethodElement.CALL_METHOD_NAME,
     );
     if (type.nullabilitySuffix == NullabilitySuffix.question) {
diff --git a/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
@@ -66,7 +66,7 @@ class MethodInvocationResolver with ScopeHelpers {
   }) : _typeType = _resolver.typeProvider.typeType,
        _inheritance = _resolver.inheritance,
        _definingLibrary = _resolver.definingLibrary,
-       _definingLibraryUri = _resolver.definingLibrary.source.uri,
+       _definingLibraryUri = _resolver.definingLibrary.uri,
        _libraryFragment = _resolver.libraryFragment,
        _localVariableTypeProvider = _resolver.localVariableTypeProvider,
        _extensionResolver = _resolver.extensionResolver,
diff --git a/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart
@@ -924,7 +924,7 @@ class PropertyElementResolver with ScopeHelpers {
 
     if (targetType is InterfaceTypeImpl) {
       if (hasRead) {
-        var name = Name(_definingLibrary.source.uri, propertyName.name);
+        var name = Name(_definingLibrary.uri, propertyName.name);
         readElement = _resolver.inheritance.getMember(
           targetType.element,
           name,
diff --git a/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart
@@ -240,7 +240,7 @@ class TypePropertyResolver {
   }
 
   void _lookupExtension(TypeImpl type) {
-    var getterName = Name(_definingLibrary.source.uri, _name);
+    var getterName = Name(_definingLibrary.uri, _name);
     var result = _extensionResolver.findExtension(
       type,
       _nameErrorEntity,
@@ -267,7 +267,7 @@ class TypePropertyResolver {
     var isSuper = _receiver is SuperExpression;
 
     if (_hasRead) {
-      var getterName = Name(_definingLibrary.source.uri, _name);
+      var getterName = Name(_definingLibrary.uri, _name);
       _getterRequested = _resolver.inheritance.getMember3(
         type,
         getterName,
@@ -285,7 +285,7 @@ class TypePropertyResolver {
     }
 
     if (_hasWrite) {
-      var setterName = Name(_definingLibrary.source.uri, '$_name=');
+      var setterName = Name(_definingLibrary.uri, '$_name=');
       _setterRequested = _resolver.inheritance.getMember3(
         type,
         setterName,
@@ -307,7 +307,7 @@ class TypePropertyResolver {
     // if there is the setter, i.e. the basename at all. If there is, we
     // should not check extensions.
     if (_hasRead && _getterRequested == null) {
-      var setterName = Name(_definingLibrary.source.uri, '$_name=');
+      var setterName = Name(_definingLibrary.uri, '$_name=');
       _setterRequested = _resolver.inheritance.getMember3(
         type,
         setterName,
@@ -316,7 +316,7 @@ class TypePropertyResolver {
     }
 
     if (_hasWrite && _setterRequested == null) {
-      var getterName = Name(_definingLibrary.source.uri, _name);
+      var getterName = Name(_definingLibrary.uri, _name);
       _getterRequested = _resolver.inheritance.getMember3(
         type,
         getterName,
diff --git a/pkg/analyzer/lib/src/error/best_practices_verifier.dart b/pkg/analyzer/lib/src/error/best_practices_verifier.dart
@@ -428,7 +428,7 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
         if (element
             case PropertyAccessorElement(name: var name?) ||
                 FieldElement(name: var name?)) {
-          var nameObj = Name(_currentLibrary.source.uri, name);
+          var nameObj = Name(_currentLibrary.uri, name);
           overriddenElement =
               enclosingElement.getInheritedConcreteMember(nameObj) ??
               enclosingElement.getInheritedConcreteMember(nameObj.forSetter);
@@ -2008,20 +2008,18 @@ class _InvalidAccessVerifier {
     }
 
     if (isVisibleForTemplateApplied) {
-      var libraryFragment = definingClass.firstFragment.libraryFragment!;
       _errorReporter.atEntity(
         errorEntity,
         WarningCode.invalidUseOfVisibleForTemplateMember,
-        arguments: [name, libraryFragment.source.uri],
+        arguments: [name, definingClass.library!.uri],
       );
     }
 
     if (hasVisibleForTesting) {
-      var libraryFragment = definingClass.firstFragment.libraryFragment!;
       _errorReporter.atEntity(
         errorEntity,
         WarningCode.invalidUseOfVisibleForTestingMember,
-        arguments: [name, libraryFragment.source.uri],
+        arguments: [name, definingClass.library!.uri],
       );
     }
 
diff --git a/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart b/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
@@ -212,7 +212,7 @@ abstract class BaseDeprecatedMemberUseVerifier {
           ? '${element.displayName}.new'
           : element.displayName;
     } else if (element is LibraryElement) {
-      displayName = element.firstFragment.source.uri.toString();
+      displayName = element.uri.toString();
     } else if (node is MethodInvocation &&
         displayName == MethodElement.CALL_METHOD_NAME) {
       var invokeType = node.staticInvokeType as InterfaceType;
diff --git a/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart b/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart
@@ -885,7 +885,7 @@ class MemberDuplicateDefinitionVerifier {
     InterfaceElementImpl element,
     String baseName,
   ) {
-    var libraryUri = _currentLibrary.source.uri;
+    var libraryUri = _currentLibrary.uri;
 
     var getterName = Name(libraryUri, baseName);
     var getter = _inheritanceManager.getInherited(element, getterName);
@@ -901,7 +901,7 @@ class MemberDuplicateDefinitionVerifier {
     InterfaceElementImpl element,
     String baseName,
   ) {
-    var libraryUri = _currentLibrary.source.uri;
+    var libraryUri = _currentLibrary.uri;
 
     var getterName = Name(libraryUri, baseName);
     var getter = _inheritanceManager.getMember(element, getterName);
diff --git a/pkg/analyzer/lib/src/error/inheritance_override.dart b/pkg/analyzer/lib/src/error/inheritance_override.dart
@@ -185,7 +185,7 @@ class _ClassVerifier {
     this.onClause,
     this.superclass,
     this.withClause,
-  }) : libraryUri = library.source.uri;
+  }) : libraryUri = library.uri;
 
   /// Verify inheritance overrides, and return `true` if an error was
   /// reported which should prevent follow on diagnostics from being reported.
@@ -445,7 +445,7 @@ class _ClassVerifier {
   }) {
     // The SDK implementation may implement disallowed types. For example,
     // JSNumber in dart2js and _Smi in Dart VM both implement int.
-    if (library.source.uri.isScheme('dart')) {
+    if (library.uri.isScheme('dart')) {
       return false;
     }
 
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -317,7 +317,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
          diagnosticReporter,
          libraryContext.duplicationDefinitionContext,
        ) {
-    _isInSystemLibrary = _currentLibrary.source.uri.isScheme('dart');
+    _isInSystemLibrary = _currentLibrary.uri.isScheme('dart');
     _isInStaticVariableDeclaration = false;
     _isInConstructorInitializer = false;
     _intType = _typeProvider.intType;
@@ -2221,7 +2221,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       return;
     }
 
-    Uri libraryUri = _currentLibrary.source.uri;
+    Uri libraryUri = _currentLibrary.uri;
     var conflictingDeclaredNames = <String>{};
 
     // method declared in the enclosing class vs. inherited getter/setter
@@ -3235,7 +3235,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     }
     // The SDK implementation may implement disallowed types. For example,
     // JSNumber in dart2js and _Smi in Dart VM both implement int.
-    if (_currentLibrary.source.uri.isScheme('dart')) {
+    if (_currentLibrary.uri.isScheme('dart')) {
       return false;
     }
     var type = namedType.type;
@@ -6246,7 +6246,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     if (importedUri != 'dart:_wasm') {
       return false;
     }
-    var importingUri = _currentLibrary.source.uri.toString();
+    var importingUri = _currentLibrary.uri.toString();
     if (importingUri == 'package:js/js.dart') {
       return true;
     } else if (importingUri.startsWith('package:ui/')) {
diff --git a/pkg/analyzer/lib/src/summary2/bundle_reader.dart b/pkg/analyzer/lib/src/summary2/bundle_reader.dart
@@ -208,7 +208,7 @@ class LibraryReader {
       );
 
       _libraryElement.exportNamespace = _elementFactory.buildExportNamespace(
-        _libraryElement.source.uri,
+        _libraryElement.uri,
         _libraryElement.exportedReferences,
       );
     });
diff --git a/pkg/analyzer/lib/src/summary2/bundle_writer.dart b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
@@ -132,7 +132,7 @@ class BundleWriter {
     );
 
     _libraries.add(
-      _Library(uriStr: '${libraryElement.source.uri}', offset: libraryOffset),
+      _Library(uriStr: '${libraryElement.uri}', offset: libraryOffset),
     );
   }
 
diff --git a/pkg/analyzer/lib/src/summary2/instance_member_inferrer.dart b/pkg/analyzer/lib/src/summary2/instance_member_inferrer.dart
@@ -105,19 +105,19 @@ class InstanceMemberInferrer {
       if (getter.isSynthetic || getter.isStatic) {
         return;
       }
-      elementLibraryUri = getter.library.source.uri;
+      elementLibraryUri = getter.library.uri;
       elementName = getter.displayName;
     } else if (setter != null) {
       if (setter.isSynthetic || setter.isStatic) {
         return;
       }
-      elementLibraryUri = setter.library.source.uri;
+      elementLibraryUri = setter.library.uri;
       elementName = setter.displayName;
     } else if (field != null) {
       if (field.isSynthetic || field.isStatic) {
         return;
       }
-      elementLibraryUri = field.library.source.uri;
+      elementLibraryUri = field.library.uri;
       elementName = field.name ?? '';
     } else {
       throw UnimplementedError();
diff --git a/pkg/analyzer/lib/src/summary2/library_builder.dart b/pkg/analyzer/lib/src/summary2/library_builder.dart
@@ -114,7 +114,7 @@ class LibraryBuilder {
           continue;
         }
 
-        var exportedUri = exportedLibrary.source.uri;
+        var exportedUri = exportedLibrary.uri;
         var exportedBuilder = linker.builders[exportedUri];
         var combinators = exportElement.combinators.build();
 
diff --git a/pkg/analyzer/lib/src/utilities/extensions/flutter.dart b/pkg/analyzer/lib/src/utilities/extensions/flutter.dart
@@ -201,7 +201,7 @@ extension DartTypeExtension on DartType? {
     return [self, ...self.element.allSupertypes].any(
       (t) =>
           t.element.name == 'Diagnosticable' &&
-          t.element.library.firstFragment.source.uri == _uriDiagnostics,
+          t.element.library.uri == _uriDiagnostics,
     );
   }
 
@@ -502,7 +502,7 @@ extension InterfaceElementExtension2 on InterfaceElement? {
     }
     for (var type in self.allSupertypes) {
       if (type.element.name == requiredName) {
-        var uri = type.element.library.firstFragment.source.uri;
+        var uri = type.element.library.uri;
         if (uri == requiredUri) {
           return true;
         }
@@ -514,9 +514,7 @@ extension InterfaceElementExtension2 on InterfaceElement? {
   /// Whether this is the exact [type] defined in the file with the given [uri].
   bool _isExactly(String type, Uri uri) {
     var self = this;
-    return self is ClassElement &&
-        self.name == type &&
-        self.firstFragment.libraryFragment.source.uri == uri;
+    return self is ClassElement && self.name == type && self.library.uri == uri;
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6137,7 +6137,6 @@ class LibraryElementImpl extends ElementImpl`
`6137`	`6137`
`6138`	`6138`	`@override`
`6139`	`6139`	`bool get isInSdk {`
`6140`		`- var uri = _firstFragment.source.uri;`
`6141`	`6140`	`return DartUriResolver.isDartUri(uri);`
`6142`	`6141`	`}`
`6143`	`6142`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ class LibraryDeclarations with _GettersAndSetters {`
`284`	`284`	`library.classes.forEach(_addGetter);`
`285`	`285`
`286`	`286`	`// Add implicit 'dart:core' declarations.`
`287`		`- if ('${library.source.uri}' == 'dart:core') {`
	`287`	`+ if ('${library.uri}' == 'dart:core') {`
`288`	`288`	`_addGetter(DynamicElementImpl.instance);`
`289`	`289`	`_addGetter(NeverElementImpl.instance);`
`290`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ class FunctionReferenceResolver {`
`158`	`158`	`return null;`
`159`	`159`	`}`
`160`	`160`	`var callMethodName = Name(`
`161`		`- _resolver.definingLibrary.source.uri,`
	`161`	`+ _resolver.definingLibrary.uri,`
`162`	`162`	`MethodElement.CALL_METHOD_NAME,`
`163`	`163`	`);`
`164`	`164`	`if (type.nullabilitySuffix == NullabilitySuffix.question) {`