add identifier panel variable types (#177)

* show parameter type in info panel

* use full name of parent

Author: ix0rai

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

@@ -1,5 +1,10 @@
 package org.quiltmc.enigma.gui.panel;
 
+import org.quiltmc.enigma.api.analysis.index.jar.EntryIndex;
+import org.quiltmc.enigma.api.analysis.index.jar.JarIndex;
+import org.quiltmc.enigma.api.translation.representation.AccessFlags;
+import org.quiltmc.enigma.api.translation.representation.ArgumentDescriptor;
+import org.quiltmc.enigma.api.translation.representation.TypeDescriptor;
 import org.quiltmc.enigma.gui.EditableType;
 import org.quiltmc.enigma.gui.Gui;
 import org.quiltmc.enigma.gui.config.Config;
@@ -118,7 +123,7 @@ public void refreshReference() {
 				th.addCopiableStringRow(I18n.translate("info_panel.identifier.obfuscated"), this.entry.getName());
 
 				if (ce.getParent() != null) {
-					th.addCopiableStringRow(I18n.translate("info_panel.identifier.superclass"), ce.getParent().getName());
+					th.addCopiableStringRow(I18n.translate("info_panel.identifier.superclass"), ce.getParent().getFullName());
 				}
 			} else if (this.deobfEntry instanceof FieldEntry fe) {
 				this.nameField = th.addRenameTextField(EditableType.FIELD, fe.getName());
@@ -152,6 +157,41 @@ public void refreshReference() {
 				th.addStringRow(I18n.translate("info_panel.identifier.class"), lve.getContainingClass().getFullName());
 				th.addCopiableStringRow(I18n.translate("info_panel.identifier.method"), lve.getParent().getName());
 				th.addStringRow(I18n.translate("info_panel.identifier.index"), Integer.toString(lve.getIndex()));
+
+				// type
+				JarIndex index = this.gui.getController().getProject().getJarIndex();
+				AccessFlags access = index.getIndex(EntryIndex.class).getMethodAccess(lve.getParent());
+				int i = access == null || access.isStatic() ? 0 : 1;
+				var args = lve.getParent().getDesc().getArgumentDescs();
+
+				for (ArgumentDescriptor arg : args) {
+					var primitive = TypeDescriptor.Primitive.get(arg.toString().charAt(0));
+
+					if (i == lve.getIndex()) {
+						String niceType;
+						if (primitive != null) {
+							niceType = arg + " (" + primitive.getKeyword() + ")";
+						} else {
+							// type will look like "LClassName;", with an optional [ at the start to denote an array
+							String raw = arg.toString();
+							// strip semicolon (;) from the end
+							raw = raw.substring(0, raw.length() - 1);
+							// handle arrays: add "[]" to the end and strip "["
+							while (raw.startsWith("[")) {
+								raw = raw.substring(1) + "[]";
+							}
+
+							// strip "L"
+							raw = raw.substring(1);
+							niceType = raw;
+						}
+
+						th.addCopiableStringRow(I18n.translate("info_panel.identifier.type"), niceType);
+						break;
+					}
+
+					i += primitive == null ? 1 : primitive.getSize();
+				}
 			} else {
 				throw new IllegalStateException("unreachable");
 			}

enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/TypeDescriptor.java

@@ -224,14 +224,14 @@ public TranslateResult<TypeDescriptor> extendedTranslate(Translator translator,
 	}
 
 	public enum Primitive {
-		BYTE('B', "byte"),
-		CHARACTER('C', "char"),
-		SHORT('S', "short"),
-		INTEGER('I', "int"),
-		LONG('J', "long"),
-		FLOAT('F', "float"),
-		DOUBLE('D', "double"),
-		BOOLEAN('Z', "boolean");
+		BYTE('B', "byte", 1),
+		CHARACTER('C', "char", 1),
+		SHORT('S', "short", 1),
+		INTEGER('I', "int", 1),
+		LONG('J', "long", 2),
+		FLOAT('F', "float", 1),
+		DOUBLE('D', "double", 2),
+		BOOLEAN('Z', "boolean", 1);
 
 		private static final Map<Character, Primitive> lookup;
 
@@ -244,10 +244,12 @@ public enum Primitive {
 
 		private final char code;
 		private final String keyword;
+		private final int size;
 
-		Primitive(char code, String keyword) {
+		Primitive(char code, String keyword, int size) {
 			this.code = code;
 			this.keyword = keyword;
+			this.size = size;
 		}
 
 		public static Primitive get(char code) {
@@ -258,6 +260,13 @@ public char getCode() {
 			return this.code;
 		}
 
+		/**
+		 * @return the amount the primitive will increment parameter indices
+		 */
+		public int getSize() {
+			return this.size;
+		}
+
 		/**
 		 * Returns the Java keyword corresponding to this primitive.
 		 */

enigma/src/main/resources/lang/en_us.json

@@ -141,6 +141,7 @@
 	"info_panel.identifier.class": "Class",
 	"info_panel.identifier.superclass": "Superclass",
 	"info_panel.identifier.obfuscated": "Obfuscated Name",
+	"info_panel.identifier.type": "Type",
 	"info_panel.identifier.type_descriptor": "Type Descriptor",
 	"info_panel.identifier.method_descriptor": "Method Descriptor",
 	"info_panel.identifier.index": "Index",

enigma/src/test/java/org/quiltmc/enigma/input/bridge/BaseClass.java

@@ -62,6 +62,10 @@ public BaseClass baz(int xz) {
 		return new BaseClass(xz, 0, xz);
 	}
 
+	public BaseClass whee(long xyz, int q, int w) {
+		return new BaseClass((int) xyz, (int) xyz, (int) xyz);
+	}
+
 	// b(II)La;
 	public BaseClass baz(int xz, int y) {
 		if (y == 0) {