new: add formatMappings pass from yarn

Author: ishland

matcher-model/src/main/java/matcher/model/mapping/Mappings.java

@@ -6,6 +6,7 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import org.slf4j.Logger;
@@ -19,6 +20,9 @@
 import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch;
 import net.fabricmc.mappingio.adapter.RegularAsFlatMappingVisitor;
 import net.fabricmc.mappingio.format.MappingFormat;
+import net.fabricmc.mappingio.tree.MappingTree;
+import net.fabricmc.mappingio.tree.MemoryMappingTree;
+import net.fabricmc.mappingio.tree.VisitOrder;
 
 import matcher.model.NameType;
 import matcher.model.Util;
@@ -508,7 +512,8 @@ public static boolean save(Path file, MappingFormat format, LocalClassEnv env,
 		List<MethodVarInstance> vars = new ArrayList<>();
 		Set<Set<MethodInstance>> exportedHierarchies = verbosity == MappingsExportVerbosity.MINIMAL ? Util.newIdentityHashSet() : null;
 
-		FlatMappingVisitor writer = new RegularAsFlatMappingVisitor(MappingWriter.create(file, format));
+		MemoryMappingTree tree = new MemoryMappingTree();
+		FlatMappingVisitor writer = new RegularAsFlatMappingVisitor(tree);
 		writer.visitNamespaces(nsNames.get(0), nsNames.subList(1, nsNames.size()));
 
 		for (ClassInstance cls : classes) {
@@ -563,6 +568,41 @@ public static boolean save(Path file, MappingFormat format, LocalClassEnv env,
 		}
 
 		writer.visitEnd();
+
+		for (MappingTree.ClassMapping classMapping : tree.getClasses()) {
+			String srcName = classMapping.getSrcName();
+			int anonClassIndex;
+
+			try {
+				anonClassIndex = Integer.parseInt(srcName.substring(srcName.lastIndexOf('$') + 1));
+			} catch (NumberFormatException e) {
+				continue;
+			}
+
+			for (int dstIdx = 0; dstIdx < tree.getMaxNamespaceId(); dstIdx++) {
+				String dstName = classMapping.getDstName(dstIdx);
+
+				if (dstName == null) {
+					continue;
+				}
+
+				int dstAnonClassIndex;
+
+				try {
+					dstAnonClassIndex = Integer.parseInt(dstName.substring(dstName.lastIndexOf('$') + 1));
+				} catch (NumberFormatException e) {
+					logger.warn("Unable to parse dst anon class index for {} -> {}", srcName, dstName);
+					continue;
+				}
+
+				if (dstAnonClassIndex != anonClassIndex) {
+					classMapping.setDstName(dstName.substring(0, dstName.lastIndexOf('$') + 1) + anonClassIndex, dstIdx);
+				}
+			}
+		}
+
+		tree.accept(Objects.requireNonNull(MappingWriter.create(file, format), "writer"), VisitOrder.createByName());
+
 		return true;
 	}