Elements. Use 'firstFragment' instead of 'declaration' in AugmentedInstanceElement and subtypes.

Change-Id: Idc3812ebc51f0bf92f467f21d91f7f4ecb3171e6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392241
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/completion/dart/candidate_suggestion.dart

@@ -173,7 +173,7 @@ final class ConstructorSuggestion extends ExecutableSuggestion
 
   @override
   String get completion {
-    var enclosingClass = element.enclosingElement3.augmented.declaration;
+    var enclosingClass = element.enclosingElement3.augmented.firstFragment;
 
     var className = enclosingClass.name;
 

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -554,7 +554,7 @@ class DeclarationHelper {
   void addPossibleRedirectionsInLibrary(
       ConstructorElement redirectingConstructor, LibraryElement library) {
     var classElement =
-        redirectingConstructor.enclosingElement3.augmented.declaration;
+        redirectingConstructor.enclosingElement3.augmented.firstFragment;
     var classType = classElement.thisType;
     var typeSystem = library.typeSystem;
     for (var unit in library.units) {

pkg/analysis_server/lib/src/services/completion/dart/relevance_computer.dart

@@ -347,7 +347,7 @@ class RelevanceComputer {
   /// Compute the relevance for [ConstructorElement].
   int _computeConstructorRelevance(ConstructorElement element,
       NeverType neverType, bool isNotImportedLibrary) {
-    var enclosingClass = element.enclosingElement3.augmented.declaration;
+    var enclosingClass = element.enclosingElement3.augmented.firstFragment;
     var returnType = instantiateInstanceElement(enclosingClass, neverType);
     return computeTopLevelRelevance(element,
         elementType: returnType, isNotImportedLibrary: isNotImportedLibrary);

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

@@ -228,7 +228,7 @@ class SuggestionBuilder {
     // If the class name is already in the text, then we don't support
     // prepending a prefix.
     assert(!hasClassName || prefix == null);
-    var enclosingClass = constructor.enclosingElement3.augmented.declaration;
+    var enclosingClass = constructor.enclosingElement3.augmented.firstFragment;
 
     if (completion == null) {
       var className = enclosingClass.name;

pkg/analysis_server/lib/src/services/completion/dart/utilities.dart

@@ -238,7 +238,7 @@ InterfaceType instantiateInstanceElement(
 bool isFlutterWidgetParameter(ParameterElement parameter) {
   var element = parameter.enclosingElement3;
   if (element is ConstructorElement &&
-      element.enclosingElement3.augmented.declaration.isWidget) {
+      element.enclosingElement3.augmented.firstFragment.isWidget) {
     return true;
   }
   return false;

pkg/analysis_server/lib/src/services/search/search_engine_internal.dart

@@ -69,7 +69,7 @@ class SearchEngineImpl implements SearchEngine {
       }
     }
 
-    await addMembers(type.augmented.declaration, null);
+    await addMembers(type.augmented.firstFragment, null);
 
     if (!hasSubtypes) {
       return null;

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

@@ -62,7 +62,7 @@ import 'package:pub_semver/pub_semver.dart';
 /// Clients may not extend, implement or mix-in this class.
 abstract class AugmentedClassElement implements AugmentedInterfaceElement {
   @override
-  ClassElement get declaration;
+  ClassElement get firstFragment;
 }
 
 /// The result of applying augmentations to an [EnumElement].
@@ -73,7 +73,7 @@ abstract class AugmentedEnumElement implements AugmentedInterfaceElement {
   List<FieldElement> get constants;
 
   @override
-  EnumElement get declaration;
+  EnumElement get firstFragment;
 }
 
 /// The result of applying augmentations to an [ExtensionElement].
@@ -90,7 +90,7 @@ abstract class AugmentedExtensionElement implements AugmentedInstanceElement {
 abstract class AugmentedExtensionTypeElement
     implements AugmentedInterfaceElement {
   @override
-  ExtensionTypeElement get declaration;
+  ExtensionTypeElement get firstFragment;
 
   /// The primary constructor of this extension.
   ConstructorElement get primaryConstructor;
@@ -114,15 +114,15 @@ abstract class AugmentedInstanceElement {
   /// other [PropertyAccessorElement]s are appended.
   List<PropertyAccessorElement> get accessors;
 
-  /// The declaration (not augmentation) that owns this result.
-  InstanceElement get declaration;
-
   /// The fields declared in this element.
   ///
   /// [FieldAugmentationElement]s replace corresponding elements, other
   /// [FieldElement]s are appended.
   List<FieldElement> get fields;
 
+  /// The declaration (not augmentation) that owns this result.
+  InstanceElement get firstFragment;
+
   /// The metadata associated with this element.
   ///
   /// This is a union of annotations associated with the class declaration and
@@ -195,7 +195,7 @@ abstract class AugmentedInterfaceElement implements AugmentedInstanceElement {
   List<ConstructorElement> get constructors;
 
   @override
-  InterfaceElement get declaration;
+  InterfaceElement get firstFragment;
 
   /// The interfaces implemented by this element.
   ///