Internal proposers

enigma-swing/build.gradle

@@ -24,6 +24,7 @@ dependencies {
 	implementation project(':enigma')
 	implementation project(':enigma-server')
 
+	implementation libs.asm
 	implementation libs.syntaxpain
 	implementation libs.jopt
 	implementation libs.flatlaf

enigma-swing/src/main/java/org/quiltmc/enigma/gui/Gui.java

@@ -435,7 +435,7 @@ public void showTokens(AbstractEditorPanel<?> editor, List<Token> tokens) {
 	}
 
 	public void showCursorReference(EntryReference<Entry<?>, Entry<?>> reference) {
-		this.infoPanel.setReference(reference == null ? null : reference.entry);
+		this.infoPanel.setReference(reference);
 	}
 
 	public void startDocChange(EditorPanel editor) {
@@ -506,7 +506,7 @@ public void toggleMapping(EditorPanel editor) {
 			return;
 		}
 
-		Entry<?> obfEntry = cursorReference.getNameableEntry();
+		Entry<?> obfEntry = cursorReference.getNameTarget(this.controller.getProject());
 		this.toggleMappingFromEntry(obfEntry);
 	}
 

enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java

@@ -437,7 +437,7 @@ public void navigateTo(Entry<?> entry) {
 	}
 
 	public void navigateTo(EntryReference<Entry<?>, Entry<?>> reference) {
-		if (!this.project.isNavigable(reference.getNameableEntry())) {
+		if (!this.project.isNavigable(reference.getNameTarget(this.project))) {
 			return;
 		}
 

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/AbstractEditorPanel.java

@@ -370,7 +370,7 @@ protected Entry<?> resolveReference(EntryReference<Entry<?>, Entry<?>> reference
 			navigationEntry = reference.entry;
 		}
 
-		return navigationEntry;
+		return this.gui.getController().getProject().getRepresentative(navigationEntry);
 	}
 
 	protected void setCursorReference(EntryReference<Entry<?>, Entry<?>> ref) {
@@ -543,7 +543,6 @@ private void showReferenceImpl(EntryReference<Entry<?>, Entry<?>> reference) {
 		final List<Token> tokens = this.getReferences(reference);
 
 		if (tokens.isEmpty()) {
-			// DEBUG
 			Logger.debug("No tokens found for {} in {}", reference, this.classHandler.getHandle().getRef());
 		} else {
 			this.gui.showTokens(this, tokens);

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/DeclarationSnippetPanel.java

@@ -54,7 +54,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import static org.quiltmc.enigma.gui.util.GuiUtil.getRecordIndexingService;
 import static java.util.Comparator.comparingInt;
 
 public class DeclarationSnippetPanel extends AbstractEditorPanel<JScrollPane> {
@@ -486,24 +485,10 @@ private static Snippet toSnippet(LineIndexer lineIndexer, Position startPos, Pos
 	}
 
 	private Optional<Target> resolveTarget(DecompiledClassSource source, Entry<?> targetEntry) {
-		return Optional.ofNullable(source.getIndex().getDeclarationToken(targetEntry))
-			.map(token -> new Target(token, targetEntry))
-			.or(() -> {
-				if (targetEntry instanceof MethodEntry targetMethod) {
-					// try to find record component getter's corresponding field instead
-					return getRecordIndexingService(this.gui)
-						.map(service -> service.getComponentField(targetMethod))
-						.flatMap(componentField -> Optional
-							.ofNullable(source.getIndex().getDeclarationToken(componentField))
-							.map(fieldToken -> new Target(fieldToken, componentField))
-						);
-				} else {
-					// This can happen as a result of #252: Issue with lost parameter connection.
-					// This can also happen when the token is from a library.
+		final Entry<?> namingTargetEntry = this.gui.getController().getProject().getRepresentative(targetEntry);
 
-					return Optional.empty();
-				}
-			});
+		return Optional.ofNullable(source.getIndex().getDeclarationToken(namingTargetEntry))
+			.map(token -> new Target(token, namingTargetEntry));
 	}
 
 	private record Target(Token token, Entry<?> entry) { }

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java

@@ -152,7 +152,7 @@ public void keyTyped(KeyEvent event) {
 				if (!event.isControlDown() && !event.isAltDown() && Character.isJavaIdentifierStart(event.getKeyChar())) {
 					EnigmaProject project = gui.getController().getProject();
 					EntryReference<Entry<?>, Entry<?>> reference = project.getRemapper().deobfuscate(EditorPanel.this.cursorReference);
-					Entry<?> entry = reference.getNameableEntry();
+					Entry<?> entry = reference.getNameTarget(EditorPanel.this.gui.getController().getProject());
 
 					String name = String.valueOf(event.getKeyChar());
 					if (entry instanceof ClassEntry classEntry && classEntry.getParent() == null) {

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/IdentifierPanel.java

@@ -2,6 +2,7 @@
 
 import org.jspecify.annotations.Nullable;
 import org.quiltmc.enigma.api.EnigmaProject;
+import org.quiltmc.enigma.api.analysis.EntryReference;
 import org.quiltmc.enigma.api.analysis.index.jar.EntryIndex;
 import org.quiltmc.enigma.api.translation.mapping.EntryChange;
 import org.quiltmc.enigma.api.translation.representation.TypeDescriptor;
@@ -19,6 +20,7 @@
 import org.quiltmc.enigma.gui.util.GridBagConstraintsBuilder;
 import org.quiltmc.enigma.gui.util.GuiUtil;
 import org.quiltmc.enigma.gui.util.ScaleUtil;
+import org.quiltmc.enigma.impl.EnigmaProjectImpl;
 import org.quiltmc.enigma.util.I18n;
 import org.quiltmc.enigma.util.validation.ValidationContext;
 
@@ -30,15 +32,17 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.MouseEvent;
+import java.util.Objects;
 
 public class IdentifierPanel {
 	private final Gui gui;
 
 	private final JPanel ui = new JPanel();
 
-	private Entry<?> lastEntry;
-	private Entry<?> entry;
-	private Entry<?> deobfEntry;
+	@Nullable
+	private EntryReference<Entry<?>, Entry<?>> lastReference;
+	@Nullable
+	private EntryReference<Entry<?>, Entry<?>> reference;
 
 	private ConvertingTextField nameField;
 
@@ -54,13 +58,15 @@ public IdentifierPanel(Gui gui) {
 		this.ui.setEnabled(false);
 	}
 
-	public void setReference(Entry<?> entry) {
-		this.entry = entry;
+	public void setReference(EntryReference<Entry<?>, Entry<?>> reference) {
+		this.reference = reference;
 		this.refreshReference();
 	}
 
 	public boolean startRenaming() {
-		if (this.nameField == null) return false;
+		if (this.nameField == null) {
+			return false;
+		}
 
 		this.nameField.startEditing();
 
@@ -78,15 +84,15 @@ public boolean startRenaming(String text) {
 
 	public void refreshReference() {
 		final EnigmaProject project = this.gui.getController().getProject();
-		this.deobfEntry = this.entry == null ? null : project.getRemapper().deobfuscate(this.entry);
+		final Entry<?> deobfEntry = this.reference == null ? null : project.getRemapper().deobfuscate(this.reference.entry);
 
 		// Prevent IdentifierPanel from being rebuilt if you didn't click off.
-		if (this.lastEntry == this.entry && this.nameField != null) {
+		if (this.lastReference == this.reference && this.nameField != null) {
 			if (!this.nameField.hasChanges()) {
 				final String name;
 
 				// Find what to set the name to.
-				if (this.deobfEntry instanceof MethodEntry methodEntry && methodEntry.isConstructor()) {
+				if (deobfEntry instanceof MethodEntry methodEntry && methodEntry.isConstructor()) {
 					// Get the parent of the method if it is a constructor.
 					final ClassEntry parent = methodEntry.getParent();
 
@@ -95,10 +101,10 @@ public void refreshReference() {
 					}
 
 					name = parent.isInnerClass() ? parent.getName() : parent.getFullName();
-				} else if (this.deobfEntry instanceof ClassEntry classEntry && !classEntry.isInnerClass()) {
+				} else if (deobfEntry instanceof ClassEntry classEntry && !classEntry.isInnerClass()) {
 					name = classEntry.getFullName();
 				} else {
-					name = this.deobfEntry.getName();
+					name = deobfEntry.getName();
 				}
 
 				this.nameField.setReferenceText(name);
@@ -107,31 +113,31 @@ public void refreshReference() {
 			return;
 		}
 
-		this.lastEntry = this.entry;
+		this.lastReference = this.reference;
 
 		this.nameField = null;
 
-		TableHelper th = new TableHelper(this.ui, this.entry, this.gui);
+		TableHelper th = new TableHelper(this.ui, this.reference, this.gui);
 		th.begin();
-		if (this.entry == null) {
+		if (this.reference == null) {
 			this.ui.setEnabled(false);
 		} else {
 			this.ui.setEnabled(true);
 
-			if (this.deobfEntry instanceof ClassEntry ce) {
+			if (deobfEntry instanceof ClassEntry ce) {
 				String name = ce.isInnerClass() ? ce.getName() : ce.getFullName();
 				this.nameField = th.addRenameTextField(EditableType.CLASS, name);
-				th.addCopiableStringRow(I18n.translate("info_panel.identifier.obfuscated"), this.entry.getName());
+				th.addCopiableStringRow(I18n.translate("info_panel.identifier.obfuscated"), this.reference.entry.getName());
 
 				if (ce.getParent() != null) {
 					th.addCopiableStringRow(I18n.translate("info_panel.identifier.outer_class"), ce.getParent().getFullName());
 				}
-			} else if (this.deobfEntry instanceof FieldEntry fe) {
+			} else if (deobfEntry instanceof FieldEntry fe) {
 				this.nameField = th.addRenameTextField(EditableType.FIELD, fe.getName());
 				th.addStringRow(I18n.translate("info_panel.identifier.class"), fe.getParent().getFullName());
-				th.addCopiableStringRow(I18n.translate("info_panel.identifier.obfuscated"), this.entry.getName());
+				th.addCopiableStringRow(I18n.translate("info_panel.identifier.obfuscated"), this.reference.entry.getName());
 				th.addCopiableStringRow(I18n.translate("info_panel.identifier.type"), toReadableType(fe.getDesc()));
-			} else if (this.deobfEntry instanceof MethodEntry me) {
+			} else if (deobfEntry instanceof MethodEntry me) {
 				if (me.isConstructor()) {
 					ClassEntry ce = me.getParent();
 					if (ce != null) {
@@ -143,37 +149,44 @@ public void refreshReference() {
 					th.addStringRow(I18n.translate("info_panel.identifier.class"), me.getParent().getFullName());
 				}
 
-				th.addCopiableStringRow(I18n.translate("info_panel.identifier.obfuscated"), this.entry.getName());
+				th.addCopiableStringRow(I18n.translate("info_panel.identifier.obfuscated"), this.reference.entry.getName());
 				th.addCopiableStringRow(I18n.translate("info_panel.identifier.method_descriptor"), me.getDesc().toString());
-			} else if (this.deobfEntry instanceof LocalVariableEntry local) {
-				EditableType type;
-
-				if (local.isArgument()) {
+			} else if (this.reference.entry instanceof LocalVariableEntry obfLocal) {
+				// DEBUG
+				// final LocalVariableEntry effectiveObfLocal = ((EnigmaProjectImpl) this.gui.getController().getProject())
+				// 		.getParamLocalClassLinkIndexingService()
+				// 		.map(service -> service.getLinkedParam(obfLocal))
+				// 		.orElse(obfLocal);
+				final LocalVariableEntry effectiveObfLocal = obfLocal;
+
+				final LocalVariableEntry effectiveDeobfLocal = project.getRemapper().deobfuscate(effectiveObfLocal);
+
+				final EditableType type;
+				if (effectiveObfLocal.isArgument()) {
 					type = EditableType.PARAMETER;
 				} else {
 					type = EditableType.LOCAL_VARIABLE;
 				}
 
-				this.nameField = th.addRenameTextField(type, local.getName());
-				th.addStringRow(I18n.translate("info_panel.identifier.class"), local.getContainingClass().getFullName());
-				th.addCopiableStringRow(I18n.translate("info_panel.identifier.method"), local.getParent().getName());
-				th.addStringRow(I18n.translate("info_panel.identifier.index"), Integer.toString(local.getIndex()));
+				this.nameField = th.addRenameTextField(type, effectiveDeobfLocal.getName());
+				th.addStringRow(I18n.translate("info_panel.identifier.class"), effectiveDeobfLocal.getContainingClass().getFullName());
+				th.addCopiableStringRow(I18n.translate("info_panel.identifier.method"), effectiveDeobfLocal.getParent().getName());
+				th.addStringRow(I18n.translate("info_panel.identifier.index"), Integer.toString(effectiveDeobfLocal.getIndex()));
 
 				// type
 				EntryIndex index = project.getJarIndex().getIndex(EntryIndex.class);
 				// EntryIndex only contains obf entries, so use the obf entry to look up the local's descriptor
-				@Nullable
-				final LocalVariableDefEntry obfLocal = index.getDefinition((LocalVariableEntry) this.entry);
-				final String localDesc = obfLocal == null
+				final LocalVariableDefEntry definition = index.getDefinition(effectiveObfLocal);
+				final String localDesc = definition == null
 						? I18n.translate("info_panel.identifier.type.unknown")
-						: toReadableType(project.getRemapper().deobfuscate(obfLocal.getDesc()));
+						: toReadableType(project.getRemapper().deobfuscate(definition.getDesc()));
 
 				th.addCopiableStringRow(I18n.translate("info_panel.identifier.type"), localDesc);
 			} else {
-				throw new IllegalStateException("unreachable");
+				throw new IllegalStateException("Unrecognized entry type: " + deobfEntry);
 			}
 
-			var mapping = project.getRemapper().getMapping(this.entry);
+			var mapping = project.getRemapper().getMapping(this.reference.entry);
 			if (Config.main().development.showMappingSourcePlugin.value() && mapping.tokenType().isProposed()) {
 				th.addStringRow(I18n.translate("dev.source_plugin"), mapping.sourcePluginId());
 			}
@@ -245,12 +258,12 @@ private void doRename(String newName) {
 	}
 
 	private EntryChange<? extends Entry<?>> getRename(String newName) {
-		Entry<?> entry = this.entry;
-		if (entry instanceof MethodEntry method && method.isConstructor()) {
-			entry = method.getContainingClass();
-		}
-
-		return EntryChange.modify(entry).withDeobfName(newName);
+		return EntryChange
+			.modify(Objects
+				.requireNonNull(this.reference, "Cannot rename without a reference!")
+				.getNameTarget(this.gui.getController().getProject())
+			)
+			.withDeobfName(newName);
 	}
 
 	public void retranslateUi() {
@@ -264,13 +277,13 @@ public JPanel getUi() {
 
 	private static final class TableHelper {
 		private final Container c;
-		private final Entry<?> e;
+		private final EntryReference<Entry<?>, Entry<?>> r;
 		private final Gui gui;
 		private int row;
 
-		TableHelper(Container c, Entry<?> e, Gui gui) {
+		TableHelper(Container c, EntryReference<Entry<?>, Entry<?>> r, Gui gui) {
 			this.c = c;
-			this.e = e;
+			this.r = r;
 			this.gui = gui;
 		}
 
@@ -314,7 +327,7 @@ public ConvertingTextField addRenameTextField(EditableType type, String c2) {
 				default -> throw new IllegalStateException("Unexpected value: " + type);
 			};
 
-			if (this.gui.getController().getProject().isRenamable(this.e)) {
+			if (this.gui.getController().getProject().isRenamable(this.r)) {
 				ConvertingTextField field = this.addConvertingTextField(description, c2);
 				field.setEditable(this.gui.isEditable(type));
 				return field;

enigma/src/main/java/org/quiltmc/enigma/api/Enigma.java

@@ -147,7 +147,7 @@ public EnigmaProject openJar(Path path, ClassProvider libraryClassProvider, Prog
 		MappingsIndex mappingsIndex = MappingsIndex.empty();
 		mappingsIndex.indexMappings(proposedNames, progress);
 
-		return new EnigmaProject(this, path, mainProjectProvider, jarIndex, libIndex, comboIndex, mappingsIndex, proposedNames, Utils.zipSha1(path));
+		return EnigmaProject.of(this, path, mainProjectProvider, jarIndex, libIndex, comboIndex, mappingsIndex, proposedNames, Utils.zipSha1(path));
 	}
 
 	private void index(