add test proposer for fallback

- fix highlighting
- only propose names for the first parameter of each method in test:parameters

Author: ix0rai

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

@@ -498,21 +498,22 @@ public void setHighlightedTokens(TokenStore tokenStore, Map<TokenType, ? extends
 		this.editor.getHighlighter().removeAllHighlights();
 
 		for (TokenType type : tokens.keySet()) {
-			BoxHighlightPainter tokenPainter = switch (type) {
+			BoxHighlightPainter typePainter = switch (type) {
 				case OBFUSCATED -> this.obfuscatedPainter;
 				case DEOBFUSCATED -> this.deobfuscatedPainter;
 				case DEBUG -> this.debugPainter;
 				case JAR_PROPOSED, DYNAMIC_PROPOSED -> this.proposedPainter;
 			};
 
 			for (Token token : tokens.get(type)) {
+				BoxHighlightPainter tokenPainter = typePainter;
 				EntryReference<Entry<?>, Entry<?>> reference = this.getReference(token);
 
 				if (reference != null) {
 					EditableType t = EditableType.fromEntry(reference.entry);
 					boolean editable = t == null || this.gui.isEditable(t);
 					boolean fallback = tokenStore.isFallback(token);
-					tokenPainter = editable ? (fallback ? this.fallbackPainter : tokenPainter) : this.proposedPainter;
+					tokenPainter = editable ? (fallback ? this.fallbackPainter : typePainter) : this.proposedPainter;
 				}
 
 				this.addHighlightedToken(token, tokenPainter);

enigma/src/testFixtures/java/org/quiltmc/enigma/test/plugin/TestEnigmaPlugin.java

@@ -18,12 +18,50 @@ public class TestEnigmaPlugin implements EnigmaPlugin {
 	@Override
 	public void init(EnigmaPluginContext ctx) {
 		this.registerParameterNamingService(ctx);
+		this.registerFieldNamingService(ctx);
 	}
 
 	private void registerParameterNamingService(EnigmaPluginContext ctx) {
 		ctx.registerService(NameProposalService.TYPE, ctx1 -> new ParameterNameProposalService());
 	}
 
+	private void registerFieldNamingService(EnigmaPluginContext ctx) {
+		ctx.registerService(NameProposalService.TYPE, ctx2 -> new StringFieldNameProposalService());
+	}
+
+	public static class StringFieldNameProposalService implements NameProposalService {
+		@Override
+		public String getId() {
+			return "test:strings";
+		}
+
+		@Override
+		public Map<Entry<?>, EntryMapping> getProposedNames(JarIndex index) {
+			EntryIndex entryIndex = index.getIndex(EntryIndex.class);
+			Map<Entry<?>, EntryMapping> names = new HashMap<>();
+
+			int fieldIndex = 0;
+			for (var field : entryIndex.getFields()) {
+				if (field.getDesc().toString().equals("Ljava/lang/String;")) {
+					names.put(field, this.createMapping("string" + fieldIndex, TokenType.JAR_PROPOSED));
+					fieldIndex++;
+				}
+			}
+
+			return names;
+		}
+
+		@Override
+		public boolean isFallback() {
+			return true;
+		}
+
+		@Override
+		public Map<Entry<?>, EntryMapping> getDynamicProposedNames(EntryRemapper remapper, Entry<?> obfEntry, EntryMapping oldMapping, EntryMapping newMapping) {
+			return null;
+		}
+	}
+
 	public static class ParameterNameProposalService implements NameProposalService {
 		private static final MethodDescriptor EQUALS_DESC = new MethodDescriptor("(Ljava/lang/Object;)Z");
 
@@ -41,7 +79,9 @@ public Map<Entry<?>, EntryMapping> getProposedNames(JarIndex index) {
 					var param = method.getParameters(entryIndex).get(0);
 					names.put(param, this.createMapping("o", TokenType.JAR_PROPOSED));
 				} else {
-					for (var param : method.getParameters(entryIndex)) {
+					// only propose a name for the first parameter
+					if (!method.getParameters(index.getIndex(EntryIndex.class)).isEmpty()) {
+						var param = method.getParameters(entryIndex).get(0);
 						names.put(param, this.createMapping("param" + param.getIndex(), TokenType.JAR_PROPOSED));
 					}
 				}

enigma/src/testFixtures/resources/profile.json

@@ -21,6 +21,9 @@
 			{
 				"id": "test:parameters"
 			},
+			{
+				"id": "test:strings"
+			},
 			{
 				"id": "enigma:record_component_proposer"
 			}