Rename ElementId to MemberId and use member: prefix instead of element:

Change-Id: I71c82318357881230edcaeefe1d86ceb50473c73
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108261
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/testing/id.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 enum IdKind {
-  element,
+  member,
   cls,
   node,
   invoke,
@@ -43,9 +43,9 @@ class IdValue {
 
   static String idToString(Id id, String value) {
     switch (id.kind) {
-      case IdKind.element:
-        ElementId elementId = id;
-        return '$elementPrefix${elementId.name}:$value';
+      case IdKind.member:
+        MemberId elementId = id;
+        return '$memberPrefix${elementId.name}:$value';
       case IdKind.cls:
         ClassId classId = id;
         return '$classPrefix${classId.name}:$value';
@@ -66,7 +66,7 @@ class IdValue {
   }
 
   static const String globalPrefix = "global#";
-  static const String elementPrefix = "element: ";
+  static const String memberPrefix = "member: ";
   static const String classPrefix = "class: ";
   static const String invokePrefix = "invoke: ";
   static const String updatePrefix = "update: ";
@@ -77,16 +77,16 @@ class IdValue {
   static IdValue decode(int offset, String text) {
     Id id;
     String expected;
-    if (text.startsWith(elementPrefix)) {
-      text = text.substring(elementPrefix.length);
+    if (text.startsWith(memberPrefix)) {
+      text = text.substring(memberPrefix.length);
       int colonPos = text.indexOf(':');
       if (colonPos == -1) throw "Invalid element id: '$text'";
       String name = text.substring(0, colonPos);
       bool isGlobal = name.startsWith(globalPrefix);
       if (isGlobal) {
         name = name.substring(globalPrefix.length);
       }
-      id = new ElementId(name, isGlobal: isGlobal);
+      id = new MemberId(name, isGlobal: isGlobal);
       expected = text.substring(colonPos + 1);
     } else if (text.startsWith(classPrefix)) {
       text = text.substring(classPrefix.length);
@@ -125,44 +125,44 @@ class IdValue {
 }
 
 /// Id for an member element.
-class ElementId implements Id {
+class MemberId implements Id {
   final String className;
   final String memberName;
   @override
   final bool isGlobal;
 
-  factory ElementId(String text, {bool isGlobal: false}) {
+  factory MemberId(String text, {bool isGlobal: false}) {
     int dotPos = text.indexOf('.');
     if (dotPos != -1) {
-      return new ElementId.internal(text.substring(dotPos + 1),
+      return new MemberId.internal(text.substring(dotPos + 1),
           className: text.substring(0, dotPos), isGlobal: isGlobal);
     } else {
-      return new ElementId.internal(text, isGlobal: isGlobal);
+      return new MemberId.internal(text, isGlobal: isGlobal);
     }
   }
 
-  ElementId.internal(this.memberName, {this.className, this.isGlobal: false});
+  MemberId.internal(this.memberName, {this.className, this.isGlobal: false});
 
   @override
   int get hashCode => className.hashCode * 13 + memberName.hashCode * 17;
 
   @override
   bool operator ==(other) {
     if (identical(this, other)) return true;
-    if (other is! ElementId) return false;
+    if (other is! MemberId) return false;
     return className == other.className && memberName == other.memberName;
   }
 
   @override
-  IdKind get kind => IdKind.element;
+  IdKind get kind => IdKind.member;
 
   String get name => className != null ? '$className.$memberName' : memberName;
 
   @override
   String get descriptor => 'member $name';
 
   @override
-  String toString() => 'element:$name';
+  String toString() => 'member:$name';
 }
 
 /// Id for a class.

pkg/front_end/lib/src/testing/id_extractor.dart

@@ -15,7 +15,7 @@ Id computeEntityId(Member node) {
   if (node is Procedure && node.kind == ProcedureKind.Setter) {
     memberName += '=';
   }
-  return new ElementId.internal(memberName, className: className);
+  return new MemberId.internal(memberName, className: className);
 }
 
 TreeNode computeTreeNodeWithOffset(TreeNode node) {
@@ -47,7 +47,7 @@ abstract class DataExtractor<T> extends Visitor with DataRegistry<T> {
   DataExtractor(this.actualMap);
 
   void computeForMember(Member member) {
-    ElementId id = computeEntityId(member);
+    MemberId id = computeEntityId(member);
     if (id == null) return;
     T value = computeMemberValue(id, member);
     TreeNode nodeWithOffset = computeTreeNodeWithOffset(member);

tests/compiler/dart2js/closure/data/captured_variable.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-/*element: boxedLoopVariableExample:*/
+/*member: boxedLoopVariableExample:*/
 boxedLoopVariableExample() {
   var input = [1, 2, 3];
   var fs = [];
@@ -15,25 +15,25 @@ boxedLoopVariableExample() {
   return fs;
 }
 
-/*element: readParameterInAnonymousClosure:*/
+/*member: readParameterInAnonymousClosure:*/
 readParameterInAnonymousClosure(/**/ parameter) {
   return /*fields=[parameter],free=[parameter]*/ () => parameter;
 }
 
-/*element: readParameterInClosure:*/
+/*member: readParameterInClosure:*/
 readParameterInClosure(/**/ parameter) {
   /*fields=[parameter],free=[parameter]*/ func() => parameter;
   return func;
 }
 
-/*element: writeParameterInAnonymousClosure:box=(box0 which holds [parameter])*/
+/*member: writeParameterInAnonymousClosure:box=(box0 which holds [parameter])*/
 writeParameterInAnonymousClosure(/*boxed*/ parameter) {
   return /*fields=[box0],free=[box0,parameter]*/ () {
     parameter = 42;
   };
 }
 
-/*element: writeParameterInClosure:box=(box0 which holds [parameter])*/
+/*member: writeParameterInClosure:box=(box0 which holds [parameter])*/
 writeParameterInClosure(/*boxed*/ parameter) {
   /*fields=[box0],free=[box0,parameter]*/ func() {
     parameter = 43;
@@ -42,20 +42,20 @@ writeParameterInClosure(/*boxed*/ parameter) {
   return func;
 }
 
-/*element: readLocalInAnonymousClosure:*/
+/*member: readLocalInAnonymousClosure:*/
 readLocalInAnonymousClosure(/**/ parameter) {
   var /**/ local = parameter;
   return /*fields=[local],free=[local]*/ () => local;
 }
 
-/*element: readLocalInClosure:*/
+/*member: readLocalInClosure:*/
 readLocalInClosure(/**/ parameter) {
   var /**/ local = parameter;
   /*fields=[local],free=[local]*/ func() => local;
   return func;
 }
 
-/*element: writeLocalInAnonymousClosure:box=(box0 which holds [local])*/
+/*member: writeLocalInAnonymousClosure:box=(box0 which holds [local])*/
 writeLocalInAnonymousClosure(/**/ parameter) {
   // ignore: UNUSED_LOCAL_VARIABLE
   var /*boxed*/ local = parameter;
@@ -64,7 +64,7 @@ writeLocalInAnonymousClosure(/**/ parameter) {
   };
 }
 
-/*element: writeLocalInClosure:box=(box0 which holds [local])*/
+/*member: writeLocalInClosure:box=(box0 which holds [local])*/
 writeLocalInClosure(/**/ parameter) {
   // ignore: UNUSED_LOCAL_VARIABLE
   var /*boxed*/ local = parameter;
@@ -75,25 +75,25 @@ writeLocalInClosure(/**/ parameter) {
   return func;
 }
 
-/*element: Foo.:hasThis*/
+/*member: Foo.:hasThis*/
 class Foo {
-  int /*element: Foo.bar:hasThis*/ bar = 4;
+  int /*member: Foo.bar:hasThis*/ bar = 4;
 
-  /*element: Foo.baz:hasThis*/ baz() {
+  /*member: Foo.baz:hasThis*/ baz() {
     /*fields=[this],free=[this],hasThis*/ func() => bar;
     return func;
   }
 }
 
-/*element: Repro.:hasThis*/
+/*member: Repro.:hasThis*/
 class Repro {
-  /*element: Repro.qux:hasThis*/ qux() {
+  /*member: Repro.qux:hasThis*/ qux() {
     /*fields=[this],free=[this],hasThis*/ threeNested(foo) =>
         /*fields=[this],free=[this],hasThis*/ (bar) => someFunction();
     return threeNested;
   }
 
-  /*element: Repro.someFunction:hasThis*/ someFunction() => 3;
+  /*member: Repro.someFunction:hasThis*/ someFunction() => 3;
 }
 
 main() {

tests/compiler/dart2js/closure/data/generic.dart

@@ -3,44 +3,44 @@
 // BSD-style license that can be found in the LICENSE file.
 
 class Class1<T> {
-  /*element: Class1.field:hasThis*/
+  /*member: Class1.field:hasThis*/
   var field = /*fields=[T],free=[T],hasThis*/ () => T;
 
-  /*element: Class1.funcField:hasThis*/
+  /*member: Class1.funcField:hasThis*/
   Function funcField;
 
-  /*element: Class1.:hasThis*/
+  /*member: Class1.:hasThis*/
   Class1() {
     field = /*fields=[T],free=[T],hasThis*/ () => T;
   }
 
-  /*element: Class1.setFunc:hasThis*/
+  /*member: Class1.setFunc:hasThis*/
   Class1.setFunc(this.funcField);
 
-  /*element: Class1.fact:*/
+  /*member: Class1.fact:*/
   factory Class1.fact() => new Class1<T>();
 
-  /*element: Class1.fact2:*/
+  /*member: Class1.fact2:*/
   factory Class1.fact2() =>
       new Class1.setFunc(/*fields=[T],free=[T]*/ () => new Set<T>());
 
-  /*element: Class1.method1:hasThis*/
+  /*member: Class1.method1:hasThis*/
   method1() => T;
 
-  /*element: Class1.method2:hasThis*/
+  /*member: Class1.method2:hasThis*/
   method2() {
     return /*fields=[this],free=[this],hasThis*/ () => T;
   }
 
-  /*element: Class1.method3:hasThis*/
+  /*member: Class1.method3:hasThis*/
   method3<S>() => S;
 
-  /*element: Class1.method4:hasThis*/
+  /*member: Class1.method4:hasThis*/
   method4<S>() {
     return /*fields=[S],free=[S],hasThis*/ () => S;
   }
 
-  /*element: Class1.method5:hasThis*/
+  /*member: Class1.method5:hasThis*/
   method5() {
     /*hasThis*/ local<S>() {
       return /*fields=[S],free=[S],hasThis*/ () => S;
@@ -49,7 +49,7 @@ class Class1<T> {
     return local<double>();
   }
 
-  /*element: Class1.method6:hasThis*/
+  /*member: Class1.method6:hasThis*/
   method6<S>() {
     /*fields=[S],free=[S],hasThis*/ local<U>() {
       return /*fields=[S,U],free=[S,U],hasThis*/ () => '$S$U';
@@ -67,15 +67,15 @@ class Class1<T> {
     return local2(local<double>());
   }
 
-  /*element: Class1.staticMethod1:*/
+  /*member: Class1.staticMethod1:*/
   static staticMethod1<S>() => S;
 
-  /*element: Class1.staticMethod2:*/
+  /*member: Class1.staticMethod2:*/
   static staticMethod2<S>() {
     return /*fields=[S],free=[S]*/ () => S;
   }
 
-  /*element: Class1.staticMethod3:*/
+  /*member: Class1.staticMethod3:*/
   static staticMethod3() {
     local<S>() {
       return /*fields=[S],free=[S]*/ () => S;
@@ -84,7 +84,7 @@ class Class1<T> {
     return local<double>();
   }
 
-  /*element: Class1.staticMethod4:*/
+  /*member: Class1.staticMethod4:*/
   static staticMethod4<S>() {
     /*fields=[S],free=[S]*/ local<U>() {
       return /*fields=[S,U],free=[S,U]*/ () => '$S$U';
@@ -97,15 +97,15 @@ class Class1<T> {
   }
 }
 
-/*element: topLevelMethod1:*/
+/*member: topLevelMethod1:*/
 topLevelMethod1<S>() => S;
 
-/*element: topLevelMethod2:*/
+/*member: topLevelMethod2:*/
 topLevelMethod2<S>() {
   return /*fields=[S],free=[S]*/ () => S;
 }
 
-/*element: topLevelMethod3:*/
+/*member: topLevelMethod3:*/
 topLevelMethod3() {
   local<S>() {
     return /*fields=[S],free=[S]*/ () => S;
@@ -114,7 +114,7 @@ topLevelMethod3() {
   return local<double>();
 }
 
-/*element: topLevelMethod4:*/
+/*member: topLevelMethod4:*/
 topLevelMethod4<S>() {
   /*fields=[S],free=[S]*/ local<U>() {
     return /*fields=[S,U],free=[S,U]*/ () => '$S$U';
@@ -126,7 +126,7 @@ topLevelMethod4<S>() {
   return local2(local<double>());
 }
 
-/*element: main:*/
+/*member: main:*/
 main() {
   new Class1<int>().method1();
   new Class1<int>.fact().method2();

tests/compiler/dart2js/closure/data/instantiation1.dart

@@ -6,9 +6,9 @@ int f<T>(T a) => null;
 
 typedef int F<R>(R a);
 
-/*element: B.:hasThis*/
+/*member: B.:hasThis*/
 class B<S> {
-  /*element: B.method:hasThis*/
+  /*member: B.method:hasThis*/
   method() {
     return
         /*strong.fields=[this],free=[this],hasThis*/

tests/compiler/dart2js/closure/data/instantiation2.dart

@@ -6,9 +6,9 @@ bool f<T>(T a) => a is T;
 
 typedef bool F<R>(R a);
 
-/*element: B.:hasThis*/
+/*member: B.:hasThis*/
 class B<S> {
-  /*element: B.method:hasThis*/
+  /*member: B.method:hasThis*/
   method() {
     return
         /*strong.fields=[this],free=[this],hasThis*/

tests/compiler/dart2js/closure/data/list_literal_class.dart

@@ -4,9 +4,9 @@
 
 import 'package:expect/expect.dart';
 
-/*element: A.:hasThis*/
+/*member: A.:hasThis*/
 class A<T> {
-  /*element: A.method:hasThis*/
+  /*member: A.method:hasThis*/
   @pragma('dart2js:noInline')
   method() {
     /*fields=[this],free=[this],hasThis*/ dynamic local() => <T>[];