Fine. Turn BaseName into extension type.

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

Author: scheglov

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

@@ -6,16 +6,36 @@ import 'package:analyzer/src/summary2/data_reader.dart';
 import 'package:analyzer/src/summary2/data_writer.dart';
 import 'package:analyzer/src/utilities/extensions/string.dart';
 
-typedef BaseName = String;
+/// The base name of an element.
+///
+/// In contrast to [LookupName] there is no `=` at the end.
+extension type BaseName(String _it) {
+  factory BaseName.read(SummaryDataReader reader) {
+    var str = reader.readStringUtf8();
+    return BaseName(str);
+  }
+
+  void write(BufferedSink sink) {
+    sink.writeStringUtf8(_it);
+  }
 
+  static int compare(BaseName left, BaseName right) {
+    return left._it.compareTo(right._it);
+  }
+}
+
+/// The lookup name of an element.
+///
+/// Specifically, for setters there is `=` at the end.
 extension type LookupName(String _it) {
   factory LookupName.read(SummaryDataReader reader) {
     var str = reader.readStringUtf8();
     return LookupName(str);
   }
 
   BaseName get asBaseName {
-    return _it.removeSuffix('=') ?? _it;
+    var str = _it.removeSuffix('=') ?? _it;
+    return str.asBaseName;
   }
 
   /// Returns the underlying [String] value, explicitly.
@@ -32,8 +52,43 @@ extension type LookupName(String _it) {
   }
 }
 
+extension BufferedSinkExtension on BufferedSink {
+  void writeBaseNameIterable(Iterable<BaseName> names) {
+    writeUInt30(names.length);
+    for (var baseName in names) {
+      baseName.write(this);
+    }
+  }
+}
+
+extension IterableOfBaseNameExtension on Iterable<BaseName> {
+  List<BaseName> sorted() => [...this]..sort(BaseName.compare);
+}
+
+extension IterableOfStringExtension on Iterable<String> {
+  Set<BaseName> toBaseNameSet() {
+    return map((str) => str.asBaseName).toSet();
+  }
+}
+
 extension StringExtension on String {
+  BaseName get asBaseName {
+    return BaseName(this);
+  }
+
   LookupName get asLookupName {
     return LookupName(this);
   }
 }
+
+extension SummaryDataReaderExtension on SummaryDataReader {
+  Set<BaseName> readBaseNameSet() {
+    var length = readUInt30();
+    var result = <BaseName>{};
+    for (var i = 0; i < length; i++) {
+      var baseName = BaseName.read(this);
+      result.add(baseName);
+    }
+    return result;
+  }
+}

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

@@ -93,11 +93,11 @@ class BundleRequirementsManifest {
           switch (combinator) {
             case HideElementCombinator():
               return ExportRequirementHideCombinator(
-                hiddenBaseNames: combinator.hiddenNames.toSet(),
+                hiddenBaseNames: combinator.hiddenNames.toBaseNameSet(),
               );
             case ShowElementCombinator():
               return ExportRequirementShowCombinator(
-                shownBaseNames: combinator.shownNames.toSet(),
+                shownBaseNames: combinator.shownNames.toBaseNameSet(),
               );
           }
         }).toList();
@@ -376,14 +376,14 @@ final class ExportRequirementHideCombinator
 
   factory ExportRequirementHideCombinator.read(SummaryDataReader reader) {
     return ExportRequirementHideCombinator(
-      hiddenBaseNames: reader.readStringUtf8Set(),
+      hiddenBaseNames: reader.readBaseNameSet(),
     );
   }
 
   @override
   void write(BufferedSink sink) {
     sink.writeEnum(_ExportRequirementCombinatorKind.hide);
-    sink.writeStringUtf8Iterable(hiddenBaseNames);
+    sink.writeBaseNameIterable(hiddenBaseNames);
   }
 }
 
@@ -398,14 +398,14 @@ final class ExportRequirementShowCombinator
 
   factory ExportRequirementShowCombinator.read(SummaryDataReader reader) {
     return ExportRequirementShowCombinator(
-      shownBaseNames: reader.readStringUtf8Set(),
+      shownBaseNames: reader.readBaseNameSet(),
     );
   }
 
   @override
   void write(BufferedSink sink) {
     sink.writeEnum(_ExportRequirementCombinatorKind.show);
-    sink.writeStringUtf8Iterable(shownBaseNames);
+    sink.writeBaseNameIterable(shownBaseNames);
   }
 }