Elements. Separate Element2.name from Element.name by renaming to 'name3'.

They were intersecting at ElementImpl and Member(s).

This will unblock updating implementations to make them nullable.

Change-Id: Ic9907eaa0ef08c096839f212668fa1e3d92bbf3d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/391540
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -75,7 +75,7 @@ class ColorComputer {
     var constructor = expression.constructorName;
     var staticElement = constructor.element;
     var classElement = staticElement?.enclosingElement2;
-    var className = classElement?.name;
+    var className = classElement?.name3;
     var constructorName = constructor.name?.name;
     var constructorArgs = expression.argumentList.arguments.toList();
 
@@ -219,7 +219,7 @@ class ColorComputer {
   }
 
   /// Checks whether this elements library is dart:ui.
-  bool _isDartUi(Element2? element) => element?.library2?.name == 'dart.ui';
+  bool _isDartUi(Element2? element) => element?.library2?.name3 == 'dart.ui';
 
   /// Checks whether this elements library is Flutter Material colors.
   bool _isFlutterMaterial(Element2? element) =>

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

@@ -465,7 +465,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
       return true;
     }
     return element is engine.TopLevelFunctionElement &&
-        element.name == 'group' &&
+        element.name3 == 'group' &&
         _isInsideTestPackage(element);
   }
 
@@ -476,7 +476,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
       return true;
     }
     return element is engine.TopLevelFunctionElement &&
-        element.name == 'test' &&
+        element.name3 == 'test' &&
         _isInsideTestPackage(element);
   }
 

pkg/analysis_server/lib/src/protocol_server.dart

@@ -277,19 +277,19 @@ Location? newLocation_fromElement2(engine.Element2? element) {
     return _locationForArgs2(fragment, range);
   } else if (element is engine.LocalFunctionElement) {
     var offset = element.nameOffset;
-    var length = element.name?.length ?? 0;
+    var length = element.name3?.length ?? 0;
     var range = engine.SourceRange(offset, length);
     var fragment = element.enclosingFunction;
     return _locationForArgs2(fragment, range);
   } else if (element is engine.LocalVariableElement2) {
     var offset = element.nameOffset;
-    var length = element.name?.length ?? 0;
+    var length = element.name3?.length ?? 0;
     var range = engine.SourceRange(offset, length);
     var fragment = element.enclosingFunction;
     return _locationForArgs2(fragment, range);
   } else if (element is engine.LabelElement2) {
     var offset = element.nameOffset;
-    var length = element.name.length;
+    var length = element.name3.length;
     var range = engine.SourceRange(offset, length);
     var fragment = element.enclosingFunction;
     return _locationForArgs2(fragment, range);

pkg/analysis_server/lib/src/services/correction/dart/add_call_super.dart

@@ -41,7 +41,7 @@ class AddCallSuper extends ResolvedCorrectionProducer {
     var nameObj = Name.forLibrary(classElement.library2, name);
     var overridden = InheritanceManager3().getInherited4(classElement, nameObj);
     if (overridden == null) return;
-    var overriddenParameters = overridden.formalParameters.map((p) => p.name);
+    var overriddenParameters = overridden.formalParameters.map((p) => p.name3);
 
     var body = methodDeclaration.body;
     var parameters = methodDeclaration.parameters?.parameters;

pkg/analysis_server/lib/src/services/correction/dart/add_field_formal_parameters.dart

@@ -56,7 +56,7 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
           if (typeSystem.isPotentiallyNonNullable(field.type)) {
             prefix = 'required ';
           }
-          return '${prefix}this.${field.name}';
+          return '${prefix}this.${field.name3}';
         }
 
         var fieldParametersCode = fields.map(parameterForField).join(', ');
@@ -79,7 +79,7 @@ class AddFieldFormalParameters extends ResolvedCorrectionProducer {
     }
 
     var fieldParametersCode =
-        fields.map((field) => 'this.${field.name}').join(', ');
+        fields.map((field) => 'this.${field.name3}').join(', ');
     await builder.addDartFileEdit(file, (builder) {
       if (lastRequiredParameter != null) {
         builder.addSimpleInsertion(

pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_case_clauses.dart

@@ -46,10 +46,10 @@ class AddMissingEnumCaseClauses extends ResolvedCorrectionProducer {
     if (expressionType is InterfaceType) {
       var enumElement = expressionType.element3;
       if (enumElement is EnumElement2) {
-        enumName = enumElement.name;
+        enumName = enumElement.name3;
         for (var field in enumElement.fields2) {
           if (field.isEnumConstant) {
-            unhandledEnumCases.addIfNotNull(field.name);
+            unhandledEnumCases.addIfNotNull(field.name3);
           }
         }
         prefix = _importPrefix(enumElement);
@@ -68,7 +68,7 @@ class AddMissingEnumCaseClauses extends ResolvedCorrectionProducer {
         if (expression is Identifier) {
           var element = expression.element;
           if (element is GetterElement) {
-            unhandledEnumCases.remove(element.name);
+            unhandledEnumCases.remove(element.name3);
           }
         } else if (expression is NullLiteral) {
           unhandledNullValue = false;

pkg/analysis_server/lib/src/services/correction/dart/add_missing_enum_like_case_clauses.dart

@@ -35,7 +35,7 @@ class AddMissingEnumLikeCaseClauses extends ResolvedCorrectionProducer {
         return;
       }
       var classElement = expressionType.element3;
-      var className = classElement.name;
+      var className = classElement.name3;
       if (className == null) {
         return;
       }
@@ -88,7 +88,7 @@ class AddMissingEnumLikeCaseClauses extends ResolvedCorrectionProducer {
         if (expression is Identifier) {
           var element = expression.element;
           if (element is GetterElement) {
-            caseNames.addIfNotNull(element.name);
+            caseNames.addIfNotNull(element.name3);
           }
         } else if (expression is PropertyAccess) {
           caseNames.add(expression.propertyName.name);
@@ -111,7 +111,7 @@ class AddMissingEnumLikeCaseClauses extends ResolvedCorrectionProducer {
       if (field.type != type) {
         continue;
       }
-      constantNames.addIfNotNull(field.name);
+      constantNames.addIfNotNull(field.name3);
     }
     return constantNames;
   }

pkg/analysis_server/lib/src/services/correction/dart/add_missing_required_argument.dart

@@ -67,7 +67,7 @@ class AddMissingRequiredArgument extends ResolvedCorrectionProducer {
       _missingParameterName = messageParts[1];
 
       var missingParameter = targetElement.formalParameters.firstWhereOrNull(
-        (p) => p.name == _missingParameterName,
+        (p) => p.name3 == _missingParameterName,
       );
       if (missingParameter == null) {
         return;

pkg/analysis_server/lib/src/services/correction/dart/add_missing_switch_cases.dart

@@ -172,7 +172,7 @@ class AddMissingSwitchCases extends ResolvedCorrectionProducer {
       if (part is MissingPatternEnumValuePart) {
         builder.writeReference2(part.enumElement2);
         builder.write('.');
-        builder.write(part.value2.name!);
+        builder.write(part.value2.name3!);
       } else if (part is MissingPatternTextPart) {
         builder.write(part.text);
       } else if (part is MissingPatternTypePart) {

pkg/analysis_server/lib/src/services/correction/dart/add_super_parameter.dart

@@ -54,7 +54,7 @@ class AddSuperParameter extends ResolvedCorrectionProducer {
     var superPositionalParameters = <FormalParameterElement>[];
     for (var superParameter in superParameters) {
       if (superParameter.isRequired) {
-        var name = superParameter.name;
+        var name = superParameter.name3;
         if (superParameter.isNamed) {
           if (!parameters.any((parameter) => parameter.name?.lexeme == name)) {
             missingNamedParameters.add(superParameter);
@@ -72,7 +72,7 @@ class AddSuperParameter extends ResolvedCorrectionProducer {
       if (parameter.isRequiredPositional) {
         if (parameter is! SuperFormalParameter ||
             i >= superPositionalParameters.length ||
-            parameter.name.lexeme != superPositionalParameters[i].name) {
+            parameter.name.lexeme != superPositionalParameters[i].name3) {
           arePositionalOrdered = false;
           break;
         }