Merge remote-tracking branch 'upstream/master'

Author: SpaceWalkerRS

.editorconfig

@@ -12,6 +12,7 @@ indent_style = tab
 
 [*.java]
 indent_style = tab
+ij_java_names_count_to_use_import_on_demand = 99
 
 [*.tiny]
 indent_style = tab

CHANGELOG.md

@@ -352,3 +352,17 @@ The latest release of everyone's favourite program features major upgrades to bo
 day two bugfix release for my all name proposal girlies out there in the world
 
 - fix an NPE that could occur when proposing a null mapping
+
+# 2.6.2
+
+A wealth of bugfixes brought to you by rai, iota, and friends. You'll be rich. Take my hand.
+
+- fixed CFR and vineflower not allowing renames on methods named 'new'
+- fixed renames being started when pressing non-letter keys such as escape while hovering an entry (thanks [pitheguy](https://github.com/PiTheGuy)!)
+- fixed inheritance for JRE classes not being indexed
+- fixed a possible stack overflow in `IndexEntryResolver`
+- fixed an issue with similarly-named classes causing the token highlighter to explode (thanks [pitheguy](https://github.com/PiTheGuy)!)
+- fixed translations for mapping formats not properly displaying
+- fixed deobfuscation level icons not immediately updating after stat generation completes (thanks [pitheguy](https://github.com/PiTheGuy)!)
+- improved wording of some save dialogs (thanks [pitheguy](https://github.com/PiTheGuy)!)
+- improved `PackageIndex` javadoc

build.gradle

@@ -31,7 +31,7 @@ subprojects {
 	}
 
     group = 'net.ornithemc'
-    version = '2.6.0'
+    version = '2.6.1'
 
 	var ENV = System.getenv()
 	version = version + (ENV.GITHUB_ACTIONS ? (ENV.SNAPSHOTS_URL ? "-SNAPSHOT" : "") : "+local")

buildSrc/build.gradle

@@ -1 +1,4 @@
-
+java {
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}

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

@@ -532,7 +532,7 @@ public void close() {
 				}
 
 				return null;
-			}, I18n.translate("prompt.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
+			}, I18n.translate("prompt.close.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
 		}
 	}
 

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

@@ -16,6 +16,9 @@
 import org.quiltmc.enigma.api.service.ReadWriteService;
 import org.quiltmc.enigma.api.translation.representation.entry.LocalVariableEntry;
 import org.quiltmc.enigma.gui.dialog.CrashDialog;
+import org.quiltmc.enigma.gui.docker.ClassesDocker;
+import org.quiltmc.enigma.gui.docker.CollabDocker;
+import org.quiltmc.enigma.gui.docker.Docker;
 import org.quiltmc.enigma.gui.network.IntegratedEnigmaClient;
 import org.quiltmc.enigma.impl.analysis.IndexTreeBuilder;
 import org.quiltmc.enigma.api.analysis.tree.MethodImplementationsTreeNode;
@@ -29,7 +32,6 @@
 import org.quiltmc.enigma.api.class_provider.ClasspathClassProvider;
 import org.quiltmc.enigma.gui.config.Config;
 import org.quiltmc.enigma.gui.dialog.ProgressDialog;
-import org.quiltmc.enigma.gui.docker.CollabDocker;
 import org.quiltmc.enigma.api.stats.StatType;
 import org.quiltmc.enigma.gui.util.History;
 import org.quiltmc.enigma.network.ClientPacketHandler;
@@ -83,7 +85,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -183,6 +184,13 @@ public CompletableFuture<Void> openMappings(ReadWriteService readWriteService, P
 					ProgressListener progressListener = ProgressListener.createEmpty();
 					this.gui.getMainWindow().getStatusBar().syncWith(progressListener);
 					this.statsGenerator.generate(progressListener, EditableType.toStatTypes(this.gui.getEditableTypes()), false);
+
+					// ensure all class tree dockers show the update to the stats icons
+					for (Docker docker : this.gui.getDockerManager().getActiveDockers().values()) {
+						if (docker instanceof ClassesDocker) {
+							docker.repaint();
+						}
+					}
 				}).start();
 			} catch (MappingParseException e) {
 				JOptionPane.showMessageDialog(this.gui.getFrame(), e.getMessage());
@@ -220,7 +228,7 @@ public CompletableFuture<Void> saveMappings(Path path, ReadWriteService service)
 		if (this.project == null) {
 			return CompletableFuture.completedFuture(null);
 		} else if (!service.supportsWriting()) {
-			String nonWriteableMessage = I18n.translateFormatted("menu.file.save.non_writeable", I18n.translate("mapping_format." + service.getId().toLowerCase(Locale.ROOT)));
+			String nonWriteableMessage = I18n.translateFormatted("menu.file.save.non_writeable", I18n.translate("mapping_format." + service.getId().split(":")[1].toLowerCase()));
 			JOptionPane.showMessageDialog(this.gui.getFrame(), nonWriteableMessage, I18n.translate("menu.file.save.cannot_save"), JOptionPane.ERROR_MESSAGE);
 			return CompletableFuture.completedFuture(null);
 		}

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

@@ -7,6 +7,7 @@
 import org.quiltmc.enigma.gui.docker.component.DockerSelector;
 import org.quiltmc.enigma.gui.docker.component.Draggable;
 
+import javax.annotation.Nullable;
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 import java.awt.BorderLayout;
@@ -17,7 +18,9 @@
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -37,6 +40,9 @@ public class Dock extends JPanel {
 	 */
 	private Docker.VerticalLocation hovered;
 	private boolean isSplit;
+	/**
+	 * {@code null} if the view is currently split.
+	 */
 	private DockerContainer unifiedDock;
 	private Docker toSave;
 
@@ -145,7 +151,7 @@ public void host(Docker docker, Docker.VerticalLocation verticalLocation, boolea
 		if (verticalLocation == Docker.VerticalLocation.BOTTOM || verticalLocation == Docker.VerticalLocation.TOP) {
 			// if we'd be leaving empty space via opening, we want to host the docker as the full panel
 			// this is to avoid wasting space
-			if (avoidEmptySpace && ((this.isSplit && this.getDock(verticalLocation.inverse()).getHostedDocker() == null)
+			if (avoidEmptySpace && ((this.isSplit && this.getContainer(verticalLocation.inverse()).getHostedDocker() == null)
 					|| (!this.isSplit && this.unifiedDock.getHostedDocker() == null)
 					|| (!this.isSplit && this.unifiedDock.getHostedDocker().getId().equals(docker.getId())))) {
 				this.host(docker, Docker.VerticalLocation.FULL);
@@ -158,7 +164,7 @@ public void host(Docker docker, Docker.VerticalLocation verticalLocation, boolea
 
 			// preserve divider location and host
 			int location = this.splitPane.getDividerLocation();
-			this.getDock(verticalLocation).setHostedDocker(docker);
+			this.getContainer(verticalLocation).setHostedDocker(docker);
 			this.splitPane.setDividerLocation(location);
 
 			if (this.toSave != null && !this.toSave.equals(docker)) {
@@ -229,12 +235,12 @@ public void removeDocker(Docker.VerticalLocation location) {
 
 	private void removeDocker(Docker.VerticalLocation location, boolean avoidEmptySpace) {
 		// do not leave empty dockers
-		if (avoidEmptySpace && location != Docker.VerticalLocation.FULL && this.getDock(location.inverse()).getHostedDocker() != null) {
-			this.host(this.getDock(location.inverse()).getHostedDocker(), Docker.VerticalLocation.FULL, false);
+		if (avoidEmptySpace && location != Docker.VerticalLocation.FULL && this.getContainer(location.inverse()).getHostedDocker() != null) {
+			this.host(this.getContainer(location.inverse()).getHostedDocker(), Docker.VerticalLocation.FULL, false);
 			return;
 		}
 
-		DockerContainer container = this.getDock(location);
+		DockerContainer container = this.getContainer(location);
 		if (container != null) {
 			container.setHostedDocker(null);
 		}
@@ -308,7 +314,24 @@ public boolean dropDockerFromMouse(Docker docker, MouseEvent event) {
 		return false;
 	}
 
-	public DockerContainer getDock(Docker.VerticalLocation verticalLocation) {
+	/**
+	 * {@return a map of all hosted dockers, keyed by their locations}
+	 */
+	public Map<Docker.VerticalLocation, Docker> getHostedDockers() {
+		Map<Docker.VerticalLocation, Docker> map = new HashMap<>();
+		for (Docker.VerticalLocation verticalLocation : Docker.VerticalLocation.values()) {
+			var container = this.getContainer(verticalLocation);
+
+			if (container != null && container.getHostedDocker() != null) {
+				map.put(verticalLocation, container.getHostedDocker());
+			}
+		}
+
+		return map;
+	}
+
+	@Nullable
+	private DockerContainer getContainer(Docker.VerticalLocation verticalLocation) {
 		return switch (verticalLocation) {
 			case TOP -> this.topDock;
 			case BOTTOM -> this.bottomDock;
@@ -368,6 +391,7 @@ private static class DockerContainer extends JPanel {
 			this.hostedDocker = null;
 		}
 
+		@Nullable
 		public Docker getHostedDocker() {
 			return this.hostedDocker;
 		}

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

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class DockerManager {
 	private final Map<Class<? extends Docker>, Docker> dockers = new LinkedHashMap<>();
@@ -35,6 +36,25 @@ public Dock getLeftDock() {
 		return this.leftDock;
 	}
 
+	/**
+	 * {@return a map of all currently active dockers, keyed by their locations}
+	 */
+	public Map<Docker.Location, Docker> getActiveDockers() {
+		Map<Docker.Location, Docker> activeDockers = new HashMap<>();
+
+		activeDockers.putAll(this.leftDock.getHostedDockers().entrySet().stream().collect(Collectors.toMap(
+				entry -> new Docker.Location(Docker.Side.LEFT, entry.getKey()),
+				Map.Entry::getValue
+		)));
+
+		activeDockers.putAll(this.rightDock.getHostedDockers().entrySet().stream().collect(Collectors.toMap(
+				entry -> new Docker.Location(Docker.Side.RIGHT, entry.getKey()),
+				Map.Entry::getValue
+		)));
+
+		return activeDockers;
+	}
+
 	/**
 	 * Hosts a docker, making it visible, in the location provided.
 	 * @param docker the docker to be hosted

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

@@ -341,7 +341,7 @@ private void onSaveMappingsClicked() {
 		this.gui.getController().saveMappings(this.gui.mappingsFileChooser.getSelectedFile().toPath());
 	}
 
-	private void openMappingsDiscardPrompt(Runnable then) {
+	private void openMappingsDiscardPrompt(Runnable then, boolean isReload) {
 		if (this.gui.getController().isDirty()) {
 			this.gui.showDiscardDiag((response -> {
 				if (response == JOptionPane.YES_OPTION) {
@@ -351,22 +351,22 @@ private void openMappingsDiscardPrompt(Runnable then) {
 				}
 
 				return null;
-			}), I18n.translate("prompt.close.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
+			}), I18n.translate(isReload ? "prompt.close.save_and_reload" : "prompt.close.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
 		} else {
 			then.run();
 		}
 	}
 
 	private void onCloseMappingsClicked() {
-		this.openMappingsDiscardPrompt(() -> this.gui.getController().closeMappings());
+		this.openMappingsDiscardPrompt(() -> this.gui.getController().closeMappings(), false);
 	}
 
 	private void onReloadMappingsClicked() {
-		this.openMappingsDiscardPrompt(() -> this.gui.getController().reloadMappings());
+		this.openMappingsDiscardPrompt(() -> this.gui.getController().reloadMappings(), true);
 	}
 
 	private void onReloadAllClicked() {
-		this.openMappingsDiscardPrompt(() -> this.gui.getController().reloadAll());
+		this.openMappingsDiscardPrompt(() -> this.gui.getController().reloadAll(), true);
 	}
 
 	private void onExportSourceClicked() {
@@ -575,7 +575,7 @@ private static Path findCommonPath(Path a, Path b) {
 	private static void prepareSaveMappingsAsMenu(JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) {
 		for (ReadWriteService format : gui.getController().getEnigma().getReadWriteServices()) {
 			if (format.supportsWriting()) {
-				JMenuItem item = new JMenuItem(I18n.translate("mapping_format." + format.getId().toLowerCase(Locale.ROOT)));
+				JMenuItem item = new JMenuItem(I18n.translate("mapping_format." + format.getId().split(":")[1].toLowerCase()));
 				item.addActionListener(event -> {
 					JFileChooser fileChooser = gui.mappingsFileChooser;
 					ExtensionFileFilter.setupFileChooser(gui, fileChooser, format);

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

@@ -197,7 +197,7 @@ public void keyTyped(KeyEvent event) {
 				if (ref == null) return;
 				if (!EditorPanel.this.controller.getProject().isRenamable(ref)) return;
 
-				if (!event.isControlDown() && !event.isAltDown() && Character.isJavaIdentifierPart(event.getKeyChar())) {
+				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();