Elements. Make 'get library2' non-nullable in more places.

Change-Id: I0f9a27ce61367826fb1a1af3969cef0014639a31
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398740
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/test/src/utilities/selection_coverage_test.dart

@@ -247,7 +247,7 @@ class SelectionCoverageTest {
           var overridden = inheritanceManager.getOverridden4(
             visitedNodeList.enclosingElement2 as InterfaceElement2,
             Name(
-              visitedNodeList.library2!.uri,
+              visitedNodeList.library2.uri,
               visitedNodeList.name3!,
             ),
           );

pkg/analysis_server/tool/code_completion/flutter_metrics.dart

@@ -140,8 +140,7 @@ class FlutterDataCollector extends RecursiveAstVisitor<void> {
       }
       var childWidget = element.enclosingElement2.name3!;
       var library = element.library2;
-      if (library != null &&
-          !library.uri.toString().startsWith('package:flutter/')) {
+      if (!library.uri.toString().startsWith('package:flutter/')) {
         childWidget = 'user-defined';
       }
       data.recordWidgetCreation(childWidget, parentWidget);

pkg/analyzer/lib/dart/element/element2.dart

@@ -1148,9 +1148,6 @@ abstract class InstanceElement2
   /// The getters declared in this element.
   List<GetterElement> get getters2;
 
-  @override
-  LibraryElement2 get library2;
-
   /// The methods declared in this element.
   List<MethodElement2> get methods2;
 
@@ -1957,9 +1954,6 @@ abstract class MethodElement2 implements ExecutableElement2 {
   /// The test might be based on the name of the executable element, in which
   /// case the result will be correct when the name is legal.
   bool get isOperator;
-
-  @override
-  LibraryElement2 get library2;
 }
 
 /// The portion of a [MethodElement2] contributed by a single declaration.
@@ -2250,6 +2244,9 @@ abstract class PropertyInducingElement2
   /// Whether any fragment of this variable has an initializer at declaration.
   bool get hasInitializer;
 
+  @override
+  LibraryElement2 get library2;
+
   /// The setter associated with this variable.
   ///
   /// Returns `null` if the variable is effectively `final` and therefore does
@@ -2410,9 +2407,6 @@ abstract class TopLevelFunctionElement implements ExecutableElement2 {
   ///
   /// A top-level function is an entry point if it has the name `main`.
   bool get isEntryPoint;
-
-  @override
-  LibraryElement2 get library2;
 }
 
 /// The portion of a [TopLevelFunctionElement] contributed by a single
@@ -2568,9 +2562,6 @@ abstract class TypeParameterElement2 implements TypeDefiningElement2 {
   @override
   TypeParameterFragment get firstFragment;
 
-  @override
-  LibraryElement2 get library2;
-
   /// Returns the [TypeParameterType] with the given [nullabilitySuffix] for
   /// this type parameter.
   TypeParameterType instantiate({
@@ -2607,6 +2598,9 @@ abstract class TypeParameterizedElement2 implements Element2, Annotatable {
   /// If the element does not define a type, returns `true`.
   bool get isSimplyBounded;
 
+  @override
+  LibraryElement2 get library2;
+
   /// The type parameters declared by this element directly.
   ///
   /// This does not include type parameters that are declared by any enclosing

pkg/analyzer/lib/src/dart/element/element.dart

@@ -3848,6 +3848,12 @@ abstract class ExecutableElementImpl2 extends FunctionTypedElementImpl2
     var firstFragment = this.firstFragment as ExecutableElementImpl;
     return firstFragment.hasModifier(Modifier.INVOKES_SUPER_SELF);
   }
+
+  @override
+  LibraryElement2 get library2 {
+    var firstFragment = this.firstFragment as ExecutableElementImpl;
+    return firstFragment.library2!;
+  }
 }
 
 /// A concrete implementation of an [ExtensionElement].
@@ -4282,6 +4288,11 @@ class FieldElementImpl2 extends PropertyInducingElementImpl2
   @override
   ElementKind get kind => ElementKind.FIELD;
 
+  @override
+  LibraryElement2 get library2 {
+    return firstFragment.library2!;
+  }
+
   @override
   String? get name3 => firstFragment.name2;
 
@@ -4850,15 +4861,6 @@ mixin FragmentedElementMixin<E extends Fragment> implements _Fragmented<E> {
     return false;
   }
 
-  LibraryElement2? get library2 {
-    if (firstFragment is ElementImpl) {
-      return (firstFragment as ElementImpl).library2;
-    }
-    // We should never get to this point.
-    assert(false, 'Fragment does not implement ElementImpl');
-    return null;
-  }
-
   /// A list of all of the fragments from which this element is composed.
   List<E> get _fragments {
     var result = <E>[];
@@ -6463,6 +6465,11 @@ class LabelElementImpl extends ElementImpl
   @override
   ElementKind get kind => ElementKind.LABEL;
 
+  @override
+  LibraryElement2 get library2 {
+    return libraryFragment.element;
+  }
+
   @override
   LibraryFragment get libraryFragment => enclosingUnit as LibraryFragment;
 
@@ -6505,7 +6512,9 @@ class LabelElementImpl2 extends ElementImpl2
   LabelFragment get firstFragment => _wrappedElement;
 
   @override
-  LibraryElement2 get library2 => super.library2!;
+  LibraryElement2 get library2 {
+    return _wrappedElement.library2;
+  }
 
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) {
@@ -7329,6 +7338,11 @@ class LocalVariableElementImpl extends NonParameterVariableElementImpl
   @override
   ElementKind get kind => ElementKind.LOCAL_VARIABLE;
 
+  @override
+  LibraryElement2 get library2 {
+    return libraryFragment.element;
+  }
+
   @override
   LibraryFragment get libraryFragment => enclosingUnit as LibraryFragment;
 
@@ -7383,6 +7397,11 @@ class LocalVariableElementImpl2 extends PromotableElementImpl2
   @override
   bool get isStatic => _wrappedElement.isStatic;
 
+  @override
+  LibraryElement2 get library2 {
+    return _wrappedElement.library2;
+  }
+
   @override
   DartType get type => _wrappedElement.type;
 
@@ -7936,9 +7955,6 @@ class MethodElementImpl2 extends ExecutableElementImpl2
   @override
   ElementKind get kind => ElementKind.METHOD;
 
-  @override
-  LibraryElement2 get library2 => super.library2!;
-
   @override
   String? get lookupName {
     if (name3 == '-' && formalParameters.isEmpty) {
@@ -10097,7 +10113,9 @@ class TopLevelFunctionElementImpl extends ExecutableElementImpl2
   ElementKind get kind => ElementKind.FUNCTION;
 
   @override
-  LibraryElement2 get library2 => super.library2!;
+  LibraryElement2 get library2 {
+    return firstFragment.library2!;
+  }
 
   @override
   String? get name3 => firstFragment.name;
@@ -10205,6 +10223,11 @@ class TopLevelVariableElementImpl2 extends PropertyInducingElementImpl2
   @override
   ElementKind get kind => ElementKind.TOP_LEVEL_VARIABLE;
 
+  @override
+  LibraryElement2 get library2 {
+    return firstFragment.libraryFragment.element;
+  }
+
   @override
   String? get name3 => firstFragment.name2;
 
@@ -10509,6 +10532,11 @@ class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
   @override
   ElementKind get kind => ElementKind.TYPE_ALIAS;
 
+  @override
+  LibraryElement2 get library2 {
+    return firstFragment.library2!;
+  }
+
   @override
   String? get name3 => firstFragment.name2;
 
@@ -10770,7 +10798,7 @@ class TypeParameterElementImpl2 extends TypeDefiningElementImpl2
   ElementKind get kind => ElementKind.TYPE_PARAMETER;
 
   @override
-  LibraryElement2 get library2 => super.library2!;
+  LibraryElement2? get library2 => firstFragment.library2;
 
   @override
   Element? get _enclosingFunction => firstFragment._enclosingElement3;
@@ -11017,9 +11045,6 @@ mixin WrappedElementMixin implements ElementImpl2 {
   @override
   ElementKind get kind => _wrappedElement.kind;
 
-  @override
-  LibraryElement2? get library2 => _wrappedElement.library2;
-
   @override
   String? get name3 => _wrappedElement.name3;
 

pkg/analyzer/lib/src/dart/element/member.dart

@@ -263,7 +263,7 @@ abstract class ExecutableMember extends Member
   LibraryElement get library => _declaration.library!;
 
   @override
-  LibraryElement2? get library2 => _element2.library2;
+  LibraryElement2 get library2 => _element2.library2;
 
   @override
   Source get librarySource => _declaration.librarySource!;
@@ -555,7 +555,7 @@ class FieldMember extends VariableMember
   LibraryElement get library => _declaration.library!;
 
   @override
-  LibraryElement2? get library2 => _element2.library2;
+  LibraryElement2 get library2 => _element2.library2;
 
   @override
   String? get lookupName => _element2.lookupName;

pkg/linter/lib/src/extensions.dart

@@ -267,7 +267,7 @@ extension ConstructorElementExtension on ConstructorElement2 {
     required String className,
     required String constructorName,
   }) =>
-      library2?.name3 == uri &&
+      library2.name3 == uri &&
       enclosingElement2.name3 == className &&
       name3 == constructorName;
 }

pkg/linter/lib/src/rules/library_annotations.dart

@@ -91,6 +91,6 @@ extension on ElementAnnotation {
     var element = element2;
     return element is ConstructorElement2 &&
         element.enclosingElement2.name3 == className &&
-        element.library2?.name3 == libraryName;
+        element.library2.name3 == libraryName;
   }
 }

pkg/linter/lib/src/rules/unreachable_from_main.dart

@@ -196,7 +196,7 @@ class _ReferenceVisitor extends RecursiveAstVisitor<void> {
         var annotation = metadata.annotations[i].element2;
         if (annotation is GetterElement &&
             annotation.name3 == 'reflectiveTest' &&
-            annotation.library2?.name3 == 'test_reflective_loader') {
+            annotation.library2.name3 == 'test_reflective_loader') {
           // The class is instantiated through the use of mirrors in
           // 'test_reflective_loader'.
           var unnamedConstructor = element.constructors2

pkg/linter/tool/checks/rules/no_solo_tests.dart

@@ -61,6 +61,6 @@ extension on Annotation {
     var element = element2;
     return element is GetterElement &&
         element.name3 == 'soloTest' &&
-        element.library2?.name3 == 'test_reflective_loader';
+        element.library2.name3 == 'test_reflective_loader';
   }
 }