[Migration] Minor clean-up

Fixes a couple of the places that would have become errors when
`ElementImpl` no longer implements `Element2`. There are other places
that will break, but some of them are dependent on other changes being
made first.

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

Author: bwilkerson

pkg/analysis_server/lib/src/status/element_writer.dart

@@ -36,6 +36,7 @@ class ElementWriter with TreeWriter {
   Map<String, Object?> _computeProperties(Element2 element) {
     var properties = <String, Object?>{};
 
+    var firstFragment = element.firstFragment;
     if (element case Annotatable element) {
       properties['annotations'] = element.metadata2.annotations;
     }
@@ -51,14 +52,14 @@ class ElementWriter with TreeWriter {
         properties['isValidMixin'] = element.isValidMixin;
       }
     }
-    if (element is ConstFieldElementImpl) {
-      properties['evaluationResult'] = element.evaluationResult;
+    if (firstFragment is ConstFieldElementImpl) {
+      properties['evaluationResult'] = firstFragment.evaluationResult;
     }
-    if (element is ConstLocalVariableElementImpl) {
-      properties['evaluationResult'] = element.evaluationResult;
+    if (firstFragment is ConstLocalVariableElementImpl) {
+      properties['evaluationResult'] = firstFragment.evaluationResult;
     }
-    if (element is ConstTopLevelVariableElementImpl) {
-      properties['evaluationResult'] = element.evaluationResult;
+    if (firstFragment is ConstTopLevelVariableElementImpl) {
+      properties['evaluationResult'] = firstFragment.evaluationResult;
     }
     if (element is ConstructorElement2) {
       properties['isConst'] = element.isConst;

pkg/analyzer/lib/src/utilities/extensions/element.dart

@@ -139,8 +139,8 @@ extension Element2OrNullExtension on Element2? {
         return null;
       case ConstructorElementImpl2():
         return self.firstFragment as Element;
-      case DynamicElementImpl():
-        return self;
+      case DynamicElementImpl2():
+        return self.firstFragment;
       case ExecutableMember():
         return self.declaration as Element;
       case ExtensionElementImpl2():

pkg/analyzer/test/src/summary/element_text.dart

@@ -1162,7 +1162,8 @@ class _Element2Writer extends _AbstractElementWriter {
           _writeLibraryImport,
         );
       }
-      _writeElementList('prefixes', f, f.prefixes, _writePrefixElement);
+      _writeElementList(
+          'prefixes', f.library2!, f.prefixes, _writePrefixElement);
       // _writeList(
       //     'libraryExports', f.libraryExports, _writeLibraryExportElement);
       // _writeList('parts', f.parts, _writePartElement);

pkg/analyzer/test/util/element_printer.dart

@@ -115,7 +115,7 @@ class ElementPrinter {
         writeReference(reference!);
         _sink.write('#element');
       case LabelElementImpl():
-        _sink.write('${element.name}@${element.nameOffset}');
+        _sink.write('${element.name3}@${element.firstFragment.nameOffset2}');
       case LabelElementImpl2():
         // TODO(scheglov): nameOffset2 can be `null`
         _sink.write('${element.name3}@${element.firstFragment.nameOffset2}');
@@ -125,7 +125,7 @@ class ElementPrinter {
         // TODO(scheglov): nameOffset2 can be `null`
         _sink.write('${element.name3}@${element.firstFragment.nameOffset2}');
       case LocalVariableElementImpl():
-        _sink.write('${element.name}@${element.nameOffset}');
+        _sink.write('${element.name3}@${element.firstFragment.nameOffset2}');
       case LocalVariableElementImpl2():
         // TODO(scheglov): nameOffset2 can be `null`
         _sink.write('${element.name3}@${element.firstFragment.nameOffset2}');