commit 4cbb95180061eb0bc0282f2bded9792d52b00946
author Sigmund Cherem <sigmund@google.com> Fri Feb 15 12:56:13 2019 -0800
committer sigmundch <sigmund@google.com> Fri Feb 15 15:18:43 2019 -0800
tree 02bdb7b2587aa932a39f9c347cf943a03bc33b52
parent 812c1b167fb944a283bcbcfa93aaf40403217e70

Revert to use the old-style IDs for json codec.
This was initially added to make it easier to compare info files via text diffing, that is now supported by dumping the info into a simple text format instead

lib/json_info_codec.dart

diff --git a/lib/json_info_codec.dart b/lib/json_info_codec.dart
index e7c9364..1732a2b 100644
--- a/lib/json_info_codec.dart
+++ b/lib/json_info_codec.dart
@@ -334,8 +334,7 @@
   /// Whether to generate json compatible with format 5.1
   final bool isBackwardCompatible;
   final Map<Info, Id> ids = new HashMap<Info, Id>();
-  final Set<String> usedIds = new Set<String>();
-  final Set<int> usedOldIds = new Set<int>();
+  final Set<int> usedIds = new Set<int>();
 
   AllInfoToJsonConverter({this.isBackwardCompatible: false});
 
@@ -350,44 +349,22 @@
             info.parent != null,
         "$info");
 
-    String id;
-    int oldId;
+    int id;
     if (info is ConstantInfo) {
       // No name and no parent, so `longName` isn't helpful
       assert(info.name == null);
       assert(info.parent == null);
       assert(info.code != null);
       // Instead, use the content of the code.
-      if (isBackwardCompatible) {
-        oldId = info.code.first.text.hashCode;
-      } else {
-        id = info.code.first.text ?? "_";
-      }
+      id = info.code.first.text.hashCode;
     } else {
-      id = longName(info, useLibraryUri: true, forId: true);
-      if (isBackwardCompatible) {
-        oldId = id.hashCode;
-      } else {
-        if (info is FieldInfo || info is FunctionInfo || info is ClosureInfo) {
-          id = "${id}_${info.size}";
-        }
-      }
+      id = longName(info, useLibraryUri: true, forId: true).hashCode;
     }
 
-    String candidateId;
-    if (isBackwardCompatible) {
-      while (!usedOldIds.add(oldId)) {
-        oldId++;
-      }
-      candidateId = '$oldId';
-    } else {
-      int suffix = 0;
-      do {
-        candidateId = id + (suffix == 0 ? '' : '.$suffix');
-        suffix++;
-      } while (!usedIds.add(candidateId));
+    while (!usedIds.add(id)) {
+      id++;
     }
-    serializedId = new Id(info.kind, candidateId);
+    serializedId = new Id(info.kind, '$id');
     return ids[info] = serializedId;
   }