remove JEditorPane ui key strokes that conflict with EditorPopupMenu KeyBinds, fixes #323 (#324)

make conflict removal more agressive

Author: supersaiyansubtlety

enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/keybind/KeyBind.java

@@ -15,6 +15,8 @@
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 
+import static javax.swing.SwingUtilities.getUIInputMap;
+
 public record KeyBind(String name, String category, List<Combination> combinations) {
 	public record Combination(int keyCode, int keyModifiers) {
 		public static final Combination EMPTY = new Combination(-1, 0);
@@ -23,6 +25,10 @@ public boolean matches(KeyEvent e) {
 			return e.getKeyCode() == this.keyCode && e.getModifiersEx() == this.keyModifiers;
 		}
 
+		public KeyStroke toKeyStroke() {
+			return this.toKeyStroke(0);
+		}
+
 		public KeyStroke toKeyStroke(int modifiers) {
 			modifiers = this.keyModifiers | modifiers;
 			return KeyStroke.getKeyStroke(this.keyCode, modifiers);
@@ -74,6 +80,19 @@ public boolean isEmpty() {
 		return this.combinations.isEmpty();
 	}
 
+	public void removeUiConflicts(JComponent component) {
+		final List<KeyStroke> keyStrokes = this.combinations.stream().map(Combination::toKeyStroke).toList();
+
+		for (final GuiUtil.FocusCondition condition : GuiUtil.FocusCondition.VALUES) {
+			InputMap uiInputMap = getUIInputMap(component, condition.getValue());
+			while (uiInputMap != null) {
+				keyStrokes.forEach(uiInputMap::remove);
+
+				uiInputMap = uiInputMap.getParent();
+			}
+		}
+	}
+
 	public String[] serializeCombinations() {
 		return this.combinations.stream().map(Combination::serialize).toArray(String[]::new);
 	}

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

@@ -16,14 +16,11 @@
 import java.awt.event.MouseEvent;
 import java.util.Iterator;
 import javax.annotation.Nullable;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 
 import static org.quiltmc.enigma.gui.util.GuiUtil.putKeyBindAction;
-import static javax.swing.SwingUtilities.getUIInputMap;
 
 public class EditorTabbedPane {
 	private final JTabbedPane openFiles = new JTabbedPane(SwingConstants.TOP, JTabbedPane.SCROLL_TAB_LAYOUT);
@@ -39,11 +36,7 @@ public EditorTabbedPane(Gui gui) {
 		this.navigator = new NavigatorPanel(this.gui);
 
 		this.openFiles.addMouseListener(GuiUtil.onMousePress(this::onTabPressed));
-		final InputMap openFilesInputMap = getUIInputMap(this.openFiles, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-		if (openFilesInputMap != null) {
-			// remove default JTabbedPane binding that conflicts with KeyBind for editors
-			openFilesInputMap.remove(KeyBinds.ENTRY_NAVIGATOR_LAST.toKeyStroke());
-		}
+		KeyBinds.ENTRY_NAVIGATOR_LAST.removeUiConflicts(this.openFiles);
 	}
 
 	public EditorPanel openClass(ClassEntry entry) {

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

@@ -139,6 +139,8 @@ public void keyTyped(KeyEvent event) {
 			}
 		});
 
+		this.popupMenu.getButtonKeyBinds().keySet().forEach(keyBind -> keyBind.removeUiConflicts(this.editor));
+
 		this.reloadKeyBinds();
 		this.addSourceSetListener(source -> {
 			if (this.navigatorPanel != null) {

enigma-swing/src/main/java/org/quiltmc/enigma/gui/util/GuiUtil.java

@@ -1,6 +1,7 @@
 package org.quiltmc.enigma.gui.util;
 
 import com.formdev.flatlaf.extras.FlatSVGIcon;
+import com.google.common.collect.ImmutableList;
 import org.quiltmc.config.api.values.TrackedValue;
 import org.quiltmc.enigma.api.analysis.index.jar.EntryIndex;
 import org.quiltmc.enigma.api.service.JarIndexerService;
@@ -485,10 +486,16 @@ public enum FocusCondition {
 		 */
 		WHEN_ANCESTOR_OF_FOCUSED_COMPONENT(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 
+		public static final ImmutableList<FocusCondition> VALUES = ImmutableList.copyOf(values());
+
 		private final int value;
 
 		FocusCondition(int value) {
 			this.value = value;
 		}
+
+		public int getValue() {
+			return this.value;
+		}
 	}
 }