Merge branch 'develop/2.7' into print-stats-gen-params

Author: supersaiyansubtlety

buildSrc/src/main/java/quilt/internal/task/PrintColorKeyGroupsMapCodeTask.java

@@ -8,10 +8,17 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-import java.awt.*;
-import java.util.*;
+import javax.swing.LookAndFeel;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

buildSrc/src/main/java/quilt/internal/task/ProGuardExecTask.java

@@ -85,20 +85,28 @@ static Argument<String> ofLenientEnum(String name, Class<? extends Enum<?>> type
 		return ofString(name, alternativesOf(type), explanation);
 	}
 
+	/**
+	 * Creates an enum argument that is case-insensitive.<br>
+	 * Assumes enum values have conventional {@code SCREAMING_SNAKE_CASE} names.
+	 */
 	static <E extends Enum<E>> Argument<E> ofEnum(String name, Class<E> type, String explanation) {
-		return new Argument<>(name, alternativesOf(type), string -> parseEnum(type, string), explanation);
+		return new Argument<>(name, alternativesOf(type), string -> parseCaseInsensitiveEnum(type, string), explanation);
+	}
+
+	static <E extends Enum<E>> Argument<E> ofStrictEnum(String name, Class<E> type, String explanation) {
+		return new Argument<>(name, alternativesOf(type), string -> Enum.valueOf(type, string), explanation);
 	}
 
 	static Argument<Boolean> ofBool(String name, String explanation) {
-		return new Argument<>(name, BOOL_TYPE, Argument::parseBool, explanation);
+		return new Argument<>(name, BOOL_TYPE, Boolean::parseBoolean, explanation);
 	}
 
 	static Argument<Integer> ofInt(String name, String explanation) {
 		return new Argument<>(name, INT_TYPE, Argument::parseInt, explanation);
 	}
 
 	static Argument<String> ofString(String name, String typeDescription, String explanation) {
-		return new Argument<>(name, typeDescription, Function.identity(), explanation);
+		return new Argument<>(name, typeDescription, Argument::parseString, explanation);
 	}
 
 	static Argument<Pattern> ofPattern(String name, String explanation) {
@@ -209,14 +217,22 @@ static Optional<Path> parseParentedPath(String path) {
 	}
 
 	static Optional<Path> parsePath(String path) {
-		return Optional.ofNullable(path)
+		return Optional.of(path)
 			.filter(string -> !string.isEmpty())
 			.map(Paths::get)
 			.map(Path::toAbsolutePath);
 	}
 
+	static String parseString(String string) {
+		return string.isEmpty() ? null : string;
+	}
+
+	static <E extends Enum<E>> E parseCaseInsensitiveEnum(Class<E> type, String string) {
+		return Enum.valueOf(type, string.toUpperCase());
+	}
+
 	static Pattern parsePattern(String regex) {
-		if (regex == null || regex.isEmpty()) {
+		if (regex.isEmpty()) {
 			return null;
 		}
 
@@ -227,16 +243,8 @@ static Pattern parsePattern(String regex) {
 		}
 	}
 
-	static <E extends Enum<E>> E parseEnum(Class<E> type, String name) {
-		return name == null ? null : Enum.valueOf(type, name);
-	}
-
-	static Boolean parseBool(String value) {
-		return value == null ? null : Boolean.parseBoolean(value);
-	}
-
 	static Integer parseInt(String integer) {
-		if (integer == null || integer.isEmpty()) {
+		if (integer.isEmpty()) {
 			return null;
 		} else {
 			try {
@@ -298,7 +306,8 @@ public String getDisplayForm() {
 
 	@Nullable
 	T from(Map<String, String> args) {
-		return this.fromString.apply(args.get(this.name));
+		final String string = args.get(this.name);
+		return string == null ? null : this.fromString.apply(string);
 	}
 
 	T requireFrom(Map<String, String> values) {

enigma-cli/src/main/java/org/quiltmc/enigma/command/Argument.java

@@ -27,7 +27,7 @@ public final class PrintStatsCommand extends Command<Required, Optional> {
 			"included-types", Argument.alternativesOf(StatType.class, "&|"),
 			"""
 				The stat types to include.""",
-			string -> Argument.parseEnum(StatType.class, string),
+			string -> Argument.parseCaseInsensitiveEnum(StatType.class, string),
 			Collectors.toUnmodifiableSet()
 	);
 

enigma-cli/src/main/java/org/quiltmc/enigma/command/PrintStatsCommand.java

@@ -275,7 +275,7 @@ static String runImpl(
 						message.append(':').append(delim).append(String.join(delim, lines));
 
 						if (limited) {
-							final int excess = lines.size() - limit;
+							final int excess = totalResults - limit;
 							message.append(delim).append("... and ").append(excess).append(" more ")
 									.append(type.getNameForCount(excess)).append('.');
 						}
@@ -540,7 +540,8 @@ private static boolean isMapped(EntryRemapper remapper, Entry<?> entry) {
 		private static <E extends Entry<?>> boolean typeMatches(
 				E entry, Pattern pattern, EntryRemapper remapper, Function<E, TypeDescriptor> descriptorGetter
 		) {
-			return pattern.matcher(getTypeName(descriptorGetter.apply(entry), remapper)).find();
+			final TypeDescriptor desc = descriptorGetter.apply(entry);
+			return pattern.matcher(desc.toString()).find() || pattern.matcher(getTypeName(desc, remapper)).find();
 		}
 
 		private static boolean accessMatches(

enigma-cli/src/main/java/org/quiltmc/enigma/command/SearchMappingsCommand.java

@@ -349,7 +349,8 @@ void findsPrimitiveParams() {
 				null, null,
 				null, null, null,
 				null, null, null,
-				null, Pattern.compile("^int$"), null
+				// test matching raw primitive descriptor, too
+				null, Pattern.compile("^I$"), null
 		);
 
 		assertOnlyResults(found, ResultType.PARAM, INT_PARAM, CONSTRUCTOR_INT_PARAM);
@@ -385,7 +386,8 @@ void findsTypeFilteredParamNames() {
 				null, null,
 				null, null, null,
 				null, null, null,
-				Pattern.compile("^constructor"), Pattern.compile("^java\\.lang\\.String$"), null
+				// test matching raw type descriptor, too
+				Pattern.compile("^constructor"), Pattern.compile("^Ljava/lang/String;$"), null
 		);
 
 		assertOnlyResults(found, ResultType.PARAM, CONSTRUCTOR_PARAM_STRING);
@@ -409,7 +411,7 @@ void findsFullyFilteredParamNames() {
 				null, null,
 				null, null, null,
 				null, null, null,
-				Pattern.compile("st"), Pattern.compile("^.*(?<!String)$"), access -> !access.isStatic()
+				Pattern.compile("st"), Pattern.compile("^((?!String).)*$"), access -> !access.isStatic()
 		);
 
 		assertOnlyResults(found, ResultType.PARAM, CONSTRUCTOR_INT_PARAM);

enigma-cli/src/test/java/org/quiltmc/enigma/command/SearchMappingsTest.java

@@ -1,4 +1,4 @@
-import quilt.internal.task.ProGuardExecTask
+import proguard.gradle.ProGuardTask
 
 plugins {
 	id 'application'
@@ -19,12 +19,7 @@ application {
 }
 
 tasks.named('test') {
-	inputs.files(
-		project(':enigma').tasks
-			.withType(ProGuardExecTask)
-			.named('completeTestObf')
-			.get().outJar
-	)
+	inputs.files(project(':enigma').tasks.named('completeTestObf', ProGuardTask).map { it.outJarFileCollection })
 }
 
 publishing {

enigma-server/build.gradle

@@ -11,6 +11,7 @@
 import javax.annotation.Nullable;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -26,17 +27,22 @@ public abstract class AbstractInheritanceTreeDocker extends Docker {
 	private final JLabel inactiveLabel = new JLabel();
 	private final JLabel notFoundLabel = new JLabel();
 	private final JPanel textPanel;
+	private final JPanel treePanel;
 	private final String inactiveTextKey;
 	private final String notFoundKey;
 
 	protected AbstractInheritanceTreeDocker(Gui gui, TreeCellRenderer cellRenderer, String inactiveTextKey, String notFoundKey) {
 		super(gui);
 
 		this.textPanel = new JPanel(new BorderLayout());
+		this.textPanel.add(this.inactiveLabel, BorderLayout.NORTH);
+
+		this.treePanel = new JPanel(new BorderLayout());
+		this.treePanel.add(new JScrollPane(this.tree));
+
 		this.inactiveTextKey = inactiveTextKey;
 		this.notFoundKey = notFoundKey;
 		this.retranslateUi();
-		this.textPanel.add(this.inactiveLabel, BorderLayout.NORTH);
 		this.add(this.textPanel);
 
 		this.tree.setModel(null);
@@ -67,7 +73,7 @@ private void setupTree(@Nullable TreeModel model) {
 		this.tree.setModel(model);
 		if (model != null) {
 			this.remove(this.textPanel);
-			this.add(this.tree);
+			this.add(this.treePanel);
 		} else {
 			this.textPanel.remove(this.inactiveLabel);
 			this.textPanel.add(this.notFoundLabel, BorderLayout.NORTH);
@@ -82,9 +88,14 @@ public void display(Entry<?> entry) {
 		if (node != null) {
 			// show the tree at the root
 			TreePath path = GuiUtil.getPathToRoot(node);
-			this.setupTree(new DefaultTreeModel((TreeNode) path.getPathComponent(0)));
-			this.tree.expandPath(path);
-			this.tree.setSelectionRow(this.tree.getRowForPath(path));
+			TreeNode root = (TreeNode) path.getPathComponent(0);
+			if (root.children().hasMoreElements()) { // do not display a tree with no inheritance (only a root entry)
+				this.setupTree(new DefaultTreeModel(root));
+				this.tree.expandPath(path);
+				this.tree.setSelectionRow(this.tree.getRowForPath(path));
+			} else {
+				this.setupTree(null);
+			}
 		} else {
 			this.setupTree(null);
 		}

enigma-swing/src/main/java/org/quiltmc/enigma/gui/docker/AbstractInheritanceTreeDocker.java

@@ -2,6 +2,7 @@
 
 import org.quiltmc.enigma.api.source.TokenType;
 import org.quiltmc.enigma.gui.ClassSelector;
+import org.quiltmc.enigma.gui.EditableType;
 import org.quiltmc.enigma.gui.Gui;
 import org.quiltmc.enigma.gui.docker.ClassesDocker;
 import org.quiltmc.enigma.gui.util.PackageRenamer;
@@ -32,10 +33,12 @@ public ClassSelectorPopupMenu(Gui gui, ClassesDocker docker) {
 		this.gui = gui;
 		this.selector = docker.getClassSelector();
 		this.ui = new JPopupMenu();
+		if (gui.isEditable(EditableType.CLASS)) {
+			this.ui.add(this.renamePackage);
+			this.ui.add(this.movePackage);
+			this.ui.add(this.renameClass);
+		}
 
-		this.ui.add(this.renamePackage);
-		this.ui.add(this.movePackage);
-		this.ui.add(this.renameClass);
 		this.ui.add(this.regenerateStats);
 		this.ui.add(this.toggleMapping);
 		this.ui.addSeparator();

enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/ClassSelectorPopupMenu.java

@@ -208,6 +208,8 @@ public void retranslateUi() {
 		this.showImplementationsItem.setText(I18n.translate("popup_menu.implementations"));
 		this.showCallsItem.setText(I18n.translate("popup_menu.calls"));
 		this.showCallsSpecificItem.setText(I18n.translate("popup_menu.calls.specific"));
+		this.showStructureItem.setText(I18n.translate("popup_menu.structure"));
+		this.searchStructureItem.setText(I18n.translate("popup_menu.search_structure"));
 		this.openEntryItem.setText(I18n.translate("popup_menu.declaration"));
 		this.openPreviousItem.setText(I18n.translate("popup_menu.back"));
 		this.openNextItem.setText(I18n.translate("popup_menu.forward"));