Fine. Add LibraryManifest.declaredVariables

Change-Id: Ifd23ee6f4ad9500b89c3e50bec5064b5a64cbac1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429425
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -2950,7 +2950,7 @@ class FieldElementImpl2 extends PropertyInducingElementImpl2
         FragmentedAnnotatableElementMixin<FieldFragmentImpl>,
         FragmentedElementMixin<FieldFragmentImpl>,
         _HasSinceSdkVersionMixin
-    implements FieldElement2OrMember, AnnotatableElementImpl {
+    implements FieldElement2OrMember {
   @override
   final FieldFragmentImpl firstFragment;
 
@@ -9108,7 +9108,7 @@ abstract class PropertyInducingElementImpl
 }
 
 abstract class PropertyInducingElementImpl2 extends VariableElementImpl2
-    implements PropertyInducingElement2OrMember {
+    implements PropertyInducingElement2OrMember, AnnotatableElementImpl {
   @override
   PropertyInducingElementImpl get firstFragment;
 

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

@@ -28,6 +28,7 @@ class LibraryManifest {
   final Map<LookupName, TopLevelGetterItem> declaredGetters;
   final Map<LookupName, TopLevelSetterItem> declaredSetters;
   final Map<LookupName, TopLevelFunctionItem> declaredFunctions;
+  final Map<LookupName, TopLevelVariableItem> declaredVariables;
 
   LibraryManifest({
     required this.reExportMap,
@@ -36,6 +37,7 @@ class LibraryManifest {
     required this.declaredGetters,
     required this.declaredSetters,
     required this.declaredFunctions,
+    required this.declaredVariables,
   });
 
   factory LibraryManifest.read(SummaryDataReader reader) {
@@ -56,6 +58,9 @@ class LibraryManifest {
       declaredFunctions: reader.readLookupNameMap(
         readValue: () => TopLevelFunctionItem.read(reader),
       ),
+      declaredVariables: reader.readLookupNameMap(
+        readValue: () => TopLevelVariableItem.read(reader),
+      ),
     );
   }
 
@@ -77,6 +82,7 @@ class LibraryManifest {
     declaredGetters.write(sink);
     declaredSetters.write(sink);
     declaredFunctions.write(sink);
+    declaredVariables.write(sink);
   }
 }
 
@@ -510,6 +516,22 @@ class LibraryManifestBuilder {
     newItems[lookupName] = item;
   }
 
+  void _addTopLevelVariable({
+    required EncodeContext encodingContext,
+    required Map<LookupName, TopLevelVariableItem> newItems,
+    required TopLevelVariableElementImpl2 element,
+    required LookupName lookupName,
+  }) {
+    var item = _getOrBuildElementItem(element, () {
+      return TopLevelVariableItem.fromElement(
+        id: ManifestItemId.generate(),
+        context: encodingContext,
+        element: element,
+      );
+    });
+    newItems[lookupName] = item;
+  }
+
   /// Assert that every manifest can be serialized, and when deserialized
   /// results in the same manifest.
   bool _assertSerialization() {
@@ -546,6 +568,7 @@ class LibraryManifestBuilder {
       var newTopLevelGetters = <LookupName, TopLevelGetterItem>{};
       var newTopLevelSetters = <LookupName, TopLevelSetterItem>{};
       var newTopLevelFunctions = <LookupName, TopLevelFunctionItem>{};
+      var newTopLevelVariables = <LookupName, TopLevelVariableItem>{};
 
       for (var element in libraryElement.children2) {
         var lookupName = element.lookupName?.asLookupName;
@@ -589,6 +612,14 @@ class LibraryManifestBuilder {
               element: element,
               lookupName: lookupName,
             );
+          case TopLevelVariableElementImpl2():
+            _addTopLevelVariable(
+              encodingContext: encodingContext,
+              newItems: newTopLevelVariables,
+              element: element,
+              lookupName: lookupName,
+            );
+
           // TODO(scheglov): add remaining elements
         }
       }
@@ -600,6 +631,7 @@ class LibraryManifestBuilder {
         declaredGetters: newTopLevelGetters,
         declaredSetters: newTopLevelSetters,
         declaredFunctions: newTopLevelFunctions,
+        declaredVariables: newTopLevelVariables,
       );
       libraryElement.manifest = newManifest;
       newManifests[libraryUri] = newManifest;
@@ -750,6 +782,7 @@ class LibraryManifestBuilder {
           declaredGetters: {},
           declaredSetters: {},
           declaredFunctions: {},
+          declaredVariables: {},
         );
   }
 
@@ -876,6 +909,10 @@ class _LibraryMatch {
           if (!_matchTopFunction(name: name, element: element)) {
             structureMismatched.add(element);
           }
+        case TopLevelVariableElementImpl2():
+          if (!_matchTopVariable(name: name, element: element)) {
+            structureMismatched.add(element);
+          }
       }
     }
   }
@@ -1184,4 +1221,22 @@ class _LibraryMatch {
     _addMatchingElementItem(element, item, matchContext);
     return true;
   }
+
+  bool _matchTopVariable({
+    required LookupName? name,
+    required TopLevelVariableElementImpl2 element,
+  }) {
+    var item = manifest.declaredVariables[name];
+    if (item == null) {
+      return false;
+    }
+
+    var matchContext = MatchContext(parent: null);
+    if (!item.match(matchContext, element)) {
+      return false;
+    }
+
+    _addMatchingElementItem(element, item, matchContext);
+    return true;
+  }
 }

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

@@ -1119,6 +1119,59 @@ class TopLevelSetterItem extends TopLevelItem<SetterElementImpl> {
   }
 }
 
+class TopLevelVariableItem extends TopLevelItem<TopLevelVariableElementImpl2> {
+  final ManifestType type;
+  final ManifestNode? constInitializer;
+
+  TopLevelVariableItem({
+    required super.id,
+    required super.metadata,
+    required this.type,
+    required this.constInitializer,
+  });
+
+  factory TopLevelVariableItem.fromElement({
+    required ManifestItemId id,
+    required EncodeContext context,
+    required TopLevelVariableElementImpl2 element,
+  }) {
+    return TopLevelVariableItem(
+      id: id,
+      metadata: ManifestMetadata.encode(context, element.metadata2),
+      type: element.type.encode(context),
+      constInitializer: element.constantInitializer2?.expression.encode(
+        context,
+      ),
+    );
+  }
+
+  factory TopLevelVariableItem.read(SummaryDataReader reader) {
+    return TopLevelVariableItem(
+      id: ManifestItemId.read(reader),
+      metadata: ManifestMetadata.read(reader),
+      type: ManifestType.read(reader),
+      constInitializer: ManifestNode.readOptional(reader),
+    );
+  }
+
+  @override
+  bool match(MatchContext context, TopLevelVariableElementImpl2 element) {
+    return super.match(context, element) &&
+        type.match(context, element.type) &&
+        constInitializer.match(
+          context,
+          element.constantInitializer2?.expression,
+        );
+  }
+
+  @override
+  void write(BufferedSink sink) {
+    super.write(sink);
+    type.write(sink);
+    constInitializer.writeOptional(sink);
+  }
+}
+
 enum _InstanceItemMemberItemKind { field, constructor, method, getter, setter }
 
 extension LookupNameToIdMapExtension on Map<LookupName, ManifestItemId> {