Deprecate Element.nonSynthetic2, use nonSynthetic instead.

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

Author: fshcheglov

pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart

@@ -143,7 +143,7 @@ class CallHierarchyItem {
   }
 
   static Element _nonSynthetic(Element element) {
-    element = element.nonSynthetic2;
+    element = element.nonSynthetic;
     if (element.isSynthetic) {
       element = element.enclosingElement ?? element;
     }

pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart

@@ -216,7 +216,7 @@ class TypeHierarchyItem {
   /// Returns the [SourceRange] of the code for [element].
   static SourceRange _codeRangeForElement(Element element) {
     // Non-synthetic elements should always have code locations.
-    var firstFragment = element.nonSynthetic2.firstFragment as FragmentImpl;
+    var firstFragment = element.nonSynthetic.firstFragment as FragmentImpl;
     return SourceRange(firstFragment.codeOffset!, firstFragment.codeLength!);
   }
 
@@ -227,7 +227,7 @@ class TypeHierarchyItem {
 
   /// Returns the [SourceRange] of the name for [element].
   static SourceRange _nameRangeForElement(Element element) {
-    var fragment = element.nonSynthetic2.firstFragment;
+    var fragment = element.nonSynthetic.firstFragment;
 
     // Some non-synthetic items can still have invalid nameOffsets (for example
     // a compilation unit). This should never happen here, but guard against it.

pkg/analysis_server/lib/src/computer/computer_overrides.dart

@@ -51,14 +51,14 @@ class DartUnitOverridesComputer {
         var superMember =
             superElements.isNotEmpty
                 ? proto.newOverriddenMember_fromEngine(
-                  superElements.first.nonSynthetic2,
+                  superElements.first.nonSynthetic,
                 )
                 : null;
         var interfaceMembers =
             interfaceElements
                 .map(
                   (member) => proto.newOverriddenMember_fromEngine(
-                    member.nonSynthetic2,
+                    member.nonSynthetic,
                   ),
                 )
                 .toList();

pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart

@@ -218,7 +218,7 @@ class DefinitionHandler
     // variable to get the codeOffset/codeLength.
     if (codeFragment is PropertyAccessorFragment &&
         codeFragment.element.isSynthetic) {
-      codeFragment = codeFragment.element.nonSynthetic2.firstFragment;
+      codeFragment = codeFragment.element.nonSynthetic.firstFragment;
     }
 
     // For extension types, the primary constructor has a range that covers only

pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart

@@ -94,7 +94,7 @@ class ImplementationHandler
                     // Filter based on type, so when searching for members we don't
                     // include any intermediate classes that don't have
                     // implementations for the method.
-                    ? helper.findMemberElement(element)?.nonSynthetic2
+                    ? helper.findMemberElement(element)?.nonSynthetic
                     : element;
               })
               .nonNulls

pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart

@@ -51,7 +51,7 @@ class ReferencesHandler
   }
 
   List<Location> _getDeclarations(Element element) {
-    return element.nonSynthetic2.fragments
+    return element.nonSynthetic.fragments
         .map((fragment) => fragmentToLocation(uriConverter, fragment))
         .nonNulls
         .toList();

pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart

@@ -116,7 +116,7 @@ class TypeDefinitionHandler
 
         // TODO(dantup): Consider returning all fragments for the type instead
         //  of only the first.
-        var targetFragment = element.nonSynthetic2.firstFragment;
+        var targetFragment = element.nonSynthetic.firstFragment;
         var targetUnit = targetFragment.libraryFragment;
         if (targetUnit == null) {
           return success(_emptyResult);

pkg/analysis_server/lib/src/search/type_hierarchy.dart

@@ -68,7 +68,7 @@ class TypeHierarchyComputer {
       }
       // create a subclass item
       var subMemberElement = helper.findMemberElement(subElement);
-      var subMemberElementDeclared = subMemberElement?.nonSynthetic2;
+      var subMemberElementDeclared = subMemberElement?.nonSynthetic;
       subItem = TypeHierarchyItem(
         convertElement(subElement),
         memberElement:
@@ -120,7 +120,7 @@ class TypeHierarchyComputer {
         displayName = '${classElement.displayName}<$typeArgumentsStr>';
       }
       var memberElement = helper.findMemberElement(classElement);
-      var memberElementDeclared = memberElement?.nonSynthetic2;
+      var memberElementDeclared = memberElement?.nonSynthetic;
       item = TypeHierarchyItem(
         convertElement(classElement),
         displayName: displayName,

pkg/analyzer/CHANGELOG.md

@@ -47,6 +47,7 @@
 * Deprecate `InterfaceFragment.constructors2`, use `constructors` instead.
 * Deprecate `JoinPatternVariableElement.variables2`, use `variables` instead.
 * Deprecate `Annotatable.metadata2`, use `metadata` instead.
+* Deprecate `Element.nonSynthetic2`, use `nonSynthetic` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -3373,7 +3373,8 @@ package:analyzer/dart/element/element.dart:
     library2 (getter: LibraryElement?)
     lookupName (getter: String?)
     name3 (getter: String?)
-    nonSynthetic2 (getter: Element)
+    nonSynthetic (getter: Element)
+    nonSynthetic2 (getter: Element, deprecated)
     session (getter: AnalysisSession?)
     accept2 (method: T? Function<T>(ElementVisitor2<T>))
     displayString2 (method: String Function({bool multiline, bool preferTypeAlias}))