CQ. Replace 'element2' property name with 'element' in ResolvedAstPrinter.

Change-Id: Id2be78d8fae499a47a7ed5afa4955c1b60a792d5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/452846
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: scheglov

pkg/analyzer/test/generated/simple_resolver_test.dart

@@ -877,7 +877,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -900,7 +900,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -921,7 +921,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -941,7 +941,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -993,7 +993,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -1014,7 +1014,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -1043,7 +1043,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -1064,7 +1064,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -1106,7 +1106,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -1126,7 +1126,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 
@@ -1172,7 +1172,7 @@ Annotation
     token: A
     element: <testLibrary>::@getter::A
     staticType: null
-  element2: <testLibrary>::@getter::A
+  element: <testLibrary>::@getter::A
 ''');
   }
 

pkg/analyzer/test/generated/strong_mode_test.dart

@@ -2107,7 +2107,7 @@ MethodInvocation
         asOperator: as
         type: NamedType
           name: num
-          element2: dart:core::@class::num
+          element: dart:core::@class::num
           type: num
         correspondingParameter: ParameterMember
           baseElement: s@null
@@ -3460,7 +3460,7 @@ void main() {
 FunctionDeclaration
   returnType: NamedType
     name: T
-    element2: #E0 T
+    element: #E0 T
     type: T
   name: f
   functionExpression: FunctionExpression
@@ -3477,7 +3477,7 @@ FunctionDeclaration
       parameter: SimpleFormalParameter
         type: NamedType
           name: T
-          element2: #E0 T
+          element: #E0 T
           type: T
         name: x
         declaredElement: <testLibraryFragment> x@9
@@ -3510,7 +3510,7 @@ FunctionDeclaration
 FunctionDeclaration
   returnType: NamedType
     name: T
-    element2: #E0 T
+    element: #E0 T
     type: T
   name: f
   functionExpression: FunctionExpression
@@ -3522,7 +3522,7 @@ FunctionDeclaration
           extendsKeyword: extends
           bound: NamedType
             name: num
-            element2: dart:core::@class::num
+            element: dart:core::@class::num
             type: num
           declaredElement: <testLibraryFragment> T@4
             defaultType: num
@@ -3532,7 +3532,7 @@ FunctionDeclaration
       parameter: SimpleFormalParameter
         type: NamedType
           name: T
-          element2: #E0 T
+          element: #E0 T
           type: T
         name: x
         declaredElement: <testLibraryFragment> x@21
@@ -3581,7 +3581,7 @@ MethodDeclaration
   modifierKeyword: static
   returnType: NamedType
     name: T
-    element2: #E0 T
+    element: #E0 T
     type: T
   name: f
   typeParameters: TypeParameterList
@@ -3597,7 +3597,7 @@ MethodDeclaration
     parameter: SimpleFormalParameter
       type: NamedType
         name: T
-        element2: #E0 T
+        element: #E0 T
         type: T
       name: x
       declaredElement: <testLibraryFragment> x@31
@@ -4272,10 +4272,10 @@ MethodInvocation
           arguments
             NamedType
               name: S
-              element2: #E0 S
+              element: #E0 S
               type: S
           rightBracket: >
-        element2: <testLibrary>::@class::C
+        element: <testLibrary>::@class::C
         type: C<S>
       element: ConstructorMember
         baseElement: <testLibrary>::@class::C::@constructor::new
@@ -4296,7 +4296,7 @@ MethodInvocation
     arguments
       NamedType
         name: int
-        element2: dart:core::@class::int
+        element: dart:core::@class::int
         type: int
     rightBracket: >
   argumentList: ArgumentList
@@ -4346,10 +4346,10 @@ MethodInvocation
           arguments
             NamedType
               name: S
-              element2: #E0 S
+              element: #E0 S
               type: S
           rightBracket: >
-        element2: <testLibrary>::@class::C
+        element: <testLibrary>::@class::C
         type: C<S>
       element: ConstructorMember
         baseElement: <testLibrary>::@class::C::@constructor::new
@@ -4370,7 +4370,7 @@ MethodInvocation
     arguments
       NamedType
         name: int
-        element2: dart:core::@class::int
+        element: dart:core::@class::int
         type: int
     rightBracket: >
   argumentList: ArgumentList
@@ -4441,7 +4441,7 @@ class D extends C {
 MethodDeclaration
   returnType: NamedType
     name: T
-    element2: #E0 T
+    element: #E0 T
     type: T
   name: f
   typeParameters: TypeParameterList
@@ -4457,7 +4457,7 @@ MethodDeclaration
     parameter: SimpleFormalParameter
       type: NamedType
         name: T
-        element2: #E0 T
+        element: #E0 T
         type: T
       name: y
       declaredElement: <testLibraryFragment> y@66
@@ -5690,9 +5690,9 @@ AssignmentExpression
     literal: 3
     correspondingParameter: <null>
     staticType: int
-  readElement2: <null>
+  readElement: <null>
   readType: null
-  writeElement2: v@15
+  writeElement: v@15
   writeType: dynamic
   element: <null>
   staticType: int

pkg/analyzer/test/src/dart/resolution/as_expression_test.dart

@@ -35,7 +35,7 @@ AsExpression
   asOperator: as
   type: NamedType
     name: int
-    element2: dart:core::@class::int
+    element: dart:core::@class::int
     type: int
   staticType: int
 ''');
@@ -59,7 +59,7 @@ AsExpression
   asOperator: as
   type: NamedType
     name: int
-    element2: dart:core::@class::int
+    element: dart:core::@class::int
     type: int
   staticType: int
 ''');
@@ -86,7 +86,7 @@ AsExpression
   asOperator: as
   type: NamedType
     name: T
-    element2: #E0 T
+    element: #E0 T
     type: T
   staticType: T
 ''');
@@ -128,7 +128,7 @@ AsExpression
   asOperator: as
   type: NamedType
     name: double
-    element2: dart:core::@class::double
+    element: dart:core::@class::double
     type: double
   staticType: double
 ''');