Elements. Remove FragmentImpl.nonSynthetic

This request is useful only for elements. We can create a synthetic
element, and by necessity a fragment for it, but we never create a
synthetic fragment just by itself, for a non-synthetic element.

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

Author: scheglov

pkg/analysis_server/lib/src/lsp/mapping.dart

@@ -35,8 +35,6 @@ import 'package:analyzer/src/dart/analysis/search.dart'
     show DeclarationKind;
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/error/codes.dart';
-import 'package:analyzer/src/utilities/extensions/string.dart'
-    show IntExtension;
 import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
 import 'package:analyzer_plugin/src/utilities/client_uri_converter.dart';
 import 'package:collection/collection.dart';
@@ -533,11 +531,10 @@ lsp.Location? fragmentToLocation(
   int? nameLength;
   if (fragment case PropertyAccessorFragmentImpl(
     :var isSynthetic,
-    :var nonSynthetic,
   ) when isSynthetic) {
-    var element = nonSynthetic;
-    nameOffset = element.nameOffset.nullIfNegative;
-    nameLength = element.name2?.length;
+    var element = fragment.element.nonSynthetic;
+    nameOffset = element.firstFragment.nameOffset2;
+    nameLength = element.firstFragment.name2?.length;
   } else {
     nameOffset = fragment.nameOffset2;
     nameLength = fragment.name2?.length;

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

@@ -1098,11 +1098,6 @@ class ConstructorFragmentImpl extends ExecutableFragmentImpl
     }
   }
 
-  @override
-  FragmentImpl get nonSynthetic {
-    return isSynthetic ? enclosingElement3 : this;
-  }
-
   @override
   int get offset => isSynthetic ? enclosingElement3.offset : _nameOffset;
 
@@ -3676,11 +3671,6 @@ class FormalParameterFragmentImplOfImplicitSetter
     return false;
   }
 
-  @override
-  FragmentImpl get nonSynthetic {
-    return setter.variable2;
-  }
-
   @override
   int get offset => setter.offset;
 
@@ -3999,16 +3989,6 @@ abstract class FragmentImpl implements FragmentOrMember {
     _nameOffset = offset;
   }
 
-  /// The non-synthetic element that caused this element to be created.
-  ///
-  /// If this element is not synthetic, then the element itself is returned.
-  ///
-  /// If this element is synthetic, then the corresponding non-synthetic
-  /// element is returned. For example, for a synthetic getter of a
-  /// non-synthetic field the field is returned; for a synthetic constructor
-  /// the enclosing class is returned.
-  FragmentImpl get nonSynthetic => this;
-
   @override
   AnalysisSession? get session {
     return enclosingElement3?.session;
@@ -7921,14 +7901,6 @@ class MethodFragmentImpl extends ExecutableFragmentImpl
     return name2;
   }
 
-  @override
-  FragmentImpl get nonSynthetic {
-    if (isSynthetic && enclosingElement3 is EnumFragmentImpl) {
-      return enclosingElement3;
-    }
-    return this;
-  }
-
   void addFragment(MethodFragmentImpl fragment) {
     fragment.element = element;
     fragment.previousFragment = this;
@@ -9075,15 +9047,6 @@ class PropertyAccessorFragmentImplImplicitGetter extends GetterFragmentImpl {
   @override
   String? get name2 => variable2.name2;
 
-  @override
-  FragmentImpl get nonSynthetic {
-    if (!variable2.isSynthetic) {
-      return variable2;
-    }
-    assert(enclosingElement3 is EnumFragmentImpl);
-    return enclosingElement3;
-  }
-
   @override
   int get offset => variable2.offset;
 
@@ -9134,9 +9097,6 @@ class PropertyAccessorFragmentImplImplicitSetter extends SetterFragmentImpl {
   @override
   String? get name2 => variable2.name2;
 
-  @override
-  FragmentImpl get nonSynthetic => variable2;
-
   @override
   int get offset => variable2.offset;
 
@@ -9348,21 +9308,6 @@ abstract class PropertyInducingFragmentImpl
   @override
   MetadataImpl get metadata2 => metadata;
 
-  @override
-  FragmentImpl get nonSynthetic {
-    if (isSynthetic) {
-      if (enclosingElement3 is EnumFragmentImpl) {
-        // TODO(scheglov): remove 'index'?
-        if (name2 == 'index' || name2 == 'values') {
-          return enclosingElement3;
-        }
-      }
-      return (getter ?? setter)!;
-    } else {
-      return this;
-    }
-  }
-
   /// The setter associated with this variable, or `null` if the variable
   /// is effectively `final` and therefore does not have a setter associated
   /// with it.