Fine. Include 'kind' into ManifestElement, print it.

As noted in https://dart-review.googlesource.com/c/sdk/+/429540,
without it the output was somewhat confusing.

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

Author: scheglov

pkg/analyzer/lib/src/fine/manifest_context.dart

@@ -92,6 +92,9 @@ final class ManifestElement {
   /// The URI of the library that declares the element.
   final Uri libraryUri;
 
+  /// The kind, mostly to distinguish fields and getters.
+  final ManifestElementKind kind;
+
   /// The top-level element name.
   final String topLevelName;
 
@@ -103,6 +106,7 @@ final class ManifestElement {
 
   ManifestElement({
     required this.libraryUri,
+    required this.kind,
     required this.topLevelName,
     required this.memberName,
     required this.id,
@@ -111,20 +115,22 @@ final class ManifestElement {
   factory ManifestElement.read(SummaryDataReader reader) {
     return ManifestElement(
       libraryUri: reader.readUri(),
+      kind: reader.readEnum(ManifestElementKind.values),
       topLevelName: reader.readStringUtf8(),
       memberName: reader.readOptionalStringUtf8(),
       id: reader.readOptionalObject(() => ManifestItemId.read(reader)),
     );
   }
 
   @override
-  int get hashCode => Object.hash(libraryUri, topLevelName, memberName);
+  int get hashCode => Object.hash(libraryUri, kind, topLevelName, memberName);
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     return other is ManifestElement &&
         other.libraryUri == libraryUri &&
+        other.kind == kind &&
         other.topLevelName == topLevelName &&
         other.memberName == memberName;
   }
@@ -146,6 +152,9 @@ final class ManifestElement {
     if (givenLibraryUri != libraryUri) {
       return false;
     }
+    if (ManifestElementKind.of(element) != kind) {
+      return false;
+    }
     if (givenTopLevelElement.lookupName != topLevelName) {
       return false;
     }
@@ -162,6 +171,7 @@ final class ManifestElement {
 
   void write(BufferedSink sink) {
     sink.writeUri(libraryUri);
+    sink.writeEnum(kind);
     sink.writeStringUtf8(topLevelName);
     sink.writeOptionalStringUtf8(memberName);
     id.writeOptional(sink);
@@ -181,6 +191,7 @@ final class ManifestElement {
 
     return ManifestElement(
       libraryUri: topLevelElement.library2!.uri,
+      kind: ManifestElementKind.of(element),
       topLevelName: topLevelElement.lookupName!,
       memberName: memberElement?.lookupName,
       id: context.getElementId(element),
@@ -192,6 +203,55 @@ final class ManifestElement {
   }
 }
 
+/// Note, "instance" means inside [InstanceElement], not as "not static".
+enum ManifestElementKind {
+  class_,
+  enum_,
+  mixin_,
+  topLevelVariable,
+  topLevelGetter,
+  topLevelSetter,
+  topLevelFunction,
+  instanceField,
+  instanceGetter,
+  instanceSetter,
+  instanceMethod,
+  interfaceConstructor;
+
+  static ManifestElementKind of(Element element) {
+    switch (element) {
+      case ClassElement():
+        return ManifestElementKind.class_;
+      case EnumElement():
+        return ManifestElementKind.enum_;
+      case MixinElement():
+        return ManifestElementKind.mixin_;
+      case TopLevelVariableElement():
+        return ManifestElementKind.topLevelVariable;
+      case GetterElement():
+        if (element.enclosingElement is LibraryElement) {
+          return ManifestElementKind.topLevelGetter;
+        }
+        return ManifestElementKind.instanceGetter;
+      case SetterElement():
+        if (element.enclosingElement is LibraryElement) {
+          return ManifestElementKind.topLevelSetter;
+        }
+        return ManifestElementKind.instanceSetter;
+      case TopLevelFunctionElement():
+        return ManifestElementKind.topLevelFunction;
+      case FieldElement():
+        return ManifestElementKind.instanceField;
+      case MethodElement():
+        return ManifestElementKind.instanceMethod;
+      case ConstructorElement():
+        return ManifestElementKind.interfaceConstructor;
+      default:
+        throw StateError('Unexpected (${element.runtimeType}) $element');
+    }
+  }
+}
+
 class MatchContext {
   final MatchContext? parent;
 

pkg/analyzer/test/src/dart/analysis/driver_test.dart

@@ -34373,7 +34373,7 @@ const b = 0 + a;
           tokenBuffer: 0+a
           tokenLengthList: [1, 1, 1]
           elements
-            [0] (dart:core, num, +) #M2
+            [0] (dart:core, instanceMethod, num, +) #M2
           elementIndexList
             0 = null
             5 = element 0
@@ -34402,9 +34402,9 @@ const b = 0 + a;
           tokenBuffer: 0+a
           tokenLengthList: [1, 1, 1]
           elements
-            [0] (package:test/test.dart, a) <null>
-            [1] (package:test/test.dart, a) <null>
-            [2] (dart:core, num, +) #M2
+            [0] (package:test/test.dart, topLevelGetter, a) <null>
+            [1] (package:test/test.dart, topLevelVariable, a) <null>
+            [2] (dart:core, instanceMethod, num, +) #M2
           elementIndexList
             5 = element 0
             13 = element 1
@@ -34441,9 +34441,9 @@ const b = 1 + a;
           tokenBuffer: 1+a
           tokenLengthList: [1, 1, 1]
           elements
-            [0] (package:test/test.dart, a) <null>
-            [1] (package:test/test.dart, a) <null>
-            [2] (dart:core, num, +) #M4
+            [0] (package:test/test.dart, topLevelGetter, a) <null>
+            [1] (package:test/test.dart, topLevelVariable, a) <null>
+            [2] (dart:core, instanceMethod, num, +) #M4
           elementIndexList
             5 = element 0
             13 = element 1
@@ -34465,7 +34465,7 @@ const b = 1 + a;
           tokenBuffer: 1+a
           tokenLengthList: [1, 1, 1]
           elements
-            [0] (dart:core, num, +) #M4
+            [0] (dart:core, instanceMethod, num, +) #M4
           elementIndexList
             0 = null
             5 = element 0

pkg/analyzer/test/src/dart/analysis/result_printer.dart

@@ -1105,6 +1105,7 @@ class LibraryManifestPrinter {
   void _writelnElement(ManifestElement element) {
     var parts = [
       element.libraryUri,
+      element.kind.name,
       element.topLevelName,
       if (element.memberName case var memberName?) memberName,
     ];