Elements. ElementImpl is not Element2.

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

Author: scheglov

pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart

@@ -134,28 +134,14 @@ ElementKind convertElementToElementKind(engine.Element2 element) {
 }
 
 Element convertLibraryFragment(CompilationUnitElementImpl fragment) {
-  var kind = convertElementToElementKind(fragment);
-  var name = getElementDisplayName(fragment);
-  var elementTypeParameters = _getTypeParametersString(fragment);
-  var aliasedType = getAliasedTypeString(fragment);
-  var elementParameters = getParametersString(fragment);
-  var elementReturnType = getReturnTypeString(fragment);
   return Element(
-    kind,
-    name,
+    ElementKind.COMPILATION_UNIT,
+    path.basename(fragment.source.fullName),
     Element.makeFlags(
       isPrivate: fragment.isPrivate,
       isDeprecated: fragment.hasDeprecated,
-      isAbstract: _isAbstract(fragment),
-      isConst: _isConst(fragment),
-      isFinal: _isFinal(fragment),
-      isStatic: _isStatic(fragment),
     ),
     location: newLocation_fromFragment(fragment),
-    typeParameters: elementTypeParameters,
-    aliasedType: aliasedType,
-    parameters: elementParameters,
-    returnType: elementReturnType,
   );
 }
 

pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart

@@ -9,7 +9,6 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
-import 'package:analyzer/src/dart/element/element.dart';
 
 void addDartOccurrences(OccurrencesCollector collector, CompilationUnit unit) {
   var visitor = DartUnitOccurrencesComputerVisitor();
@@ -261,7 +260,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   void _addOccurrenceAt(Element2 element, int offset, int length) {
     var canonicalElement = _canonicalizeElement(element);
-    if (canonicalElement == null || element == DynamicElementImpl.instance) {
+    if (canonicalElement == null) {
       return;
     }
     var offsetLengths = elementsOffsetLengths[canonicalElement];

pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart

@@ -111,7 +111,6 @@ class AbstractChangeMethodSignatureTest extends AbstractContextTest {
   String _elementToReferenceString(Element2 element) {
     var enclosingElement = element.enclosingElement2;
     var reference = switch (element) {
-      ElementImpl() => element.reference,
       ElementImpl2() =>
         element.reference ?? (element.firstFragment as ElementImpl).reference,
       _ => null,

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -5110,7 +5110,7 @@ final class DeclaredVariablePatternImpl extends VariablePatternImpl
         context,
         this,
         declaredElement2!,
-        declaredFragment!.name3!,
+        declaredFragment!.name,
         type?.typeOrThrow.wrapSharedTypeView());
     declaredElement2!.type = result.staticType.unwrapTypeView();
 

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -521,6 +521,7 @@ class ConstantEvaluationEngine {
 /// performed.
 @AnalyzerPublicApi(
     message: 'exposed because it is implemented by various elements')
+// TODO(scheglov): consider implementing only in Impl or removing
 abstract class ConstantEvaluationTarget extends AnalysisTarget {
   /// Return the [AnalysisContext] which should be used to evaluate this
   /// constant.