Color unobfuscated tokens in blue (#569)

Author: Earthcomputer

enigma-swing/src/main/java/cuchaz/enigma/gui/config/Themes.java

@@ -89,7 +89,8 @@ public static Map<RenamableTokenType, BoxHighlightPainter> getBoxHighlightPainte
 		return Map.of(
 				RenamableTokenType.OBFUSCATED, BoxHighlightPainter.create(UiConfig.getObfuscatedColor(), UiConfig.getObfuscatedOutlineColor()),
 				RenamableTokenType.PROPOSED, BoxHighlightPainter.create(UiConfig.getProposedColor(), UiConfig.getProposedOutlineColor()),
-				RenamableTokenType.DEOBFUSCATED, BoxHighlightPainter.create(UiConfig.getDeobfuscatedColor(), UiConfig.getDeobfuscatedOutlineColor())
+				RenamableTokenType.DEOBFUSCATED, BoxHighlightPainter.create(UiConfig.getDeobfuscatedColor(), UiConfig.getDeobfuscatedOutlineColor()),
+				RenamableTokenType.UNOBFUSCATED, BoxHighlightPainter.create(UiConfig.getUnobfuscatedColor(), UiConfig.getUnobfuscatedOutlineColor())
 		);
 	}
 

enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java

@@ -151,6 +151,14 @@ public static Color getDeobfuscatedOutlineColor() {
 		return getThemeColorRgba("Deobfuscated Outline");
 	}
 
+	public static Color getUnobfuscatedColor() {
+		return getThemeColorRgba("Unobfuscated");
+	}
+
+	public static Color getUnobfuscatedOutlineColor() {
+		return getThemeColorRgba("Unobfuscated Outline");
+	}
+
 	public static Color getEditorBackgroundColor() {
 		return getThemeColorRgb("Editor Background");
 	}
@@ -385,6 +393,10 @@ public static void setLookAndFeelDefaults(LookAndFeel laf, boolean isDark) {
 			s.setIfAbsentDouble("Deobfuscated Alpha", 1.0);
 			s.setIfAbsentRgbColor("Deobfuscated Outline", 0x50A050);
 			s.setIfAbsentDouble("Deobfuscated Outline Alpha", 1.0);
+			s.setIfAbsentRgbColor("Unobfuscated", 0x7FAAFF);
+			s.setIfAbsentDouble("Unobfuscated Alpha", 1.0);
+			s.setIfAbsentRgbColor("Unobfuscated Outline", 0x183060);
+			s.setIfAbsentDouble("Unobfuscated Outline Alpha", 1.0);
 			s.setIfAbsentRgbColor("Editor Background", 0xFFFFFF);
 			s.setIfAbsentRgbColor("Highlight", 0x3333EE);
 			s.setIfAbsentRgbColor("Caret", 0x000000);
@@ -413,6 +425,10 @@ public static void setLookAndFeelDefaults(LookAndFeel laf, boolean isDark) {
 			s.setIfAbsentDouble("Deobfuscated Alpha", 0.3);
 			s.setIfAbsentRgbColor("Deobfuscated Outline", 0x50FA7B);
 			s.setIfAbsentDouble("Deobfuscated Outline Alpha", 0.5);
+			s.setIfAbsentRgbColor("Unobfuscated", 0x3794FF);
+			s.setIfAbsentDouble("Unobfuscated Alpha", 0.3);
+			s.setIfAbsentRgbColor("Unobfuscated Outline", 0x3794FF);
+			s.setIfAbsentDouble("Unobfuscated Outline Alpha", 0.5);
 			s.setIfAbsentRgbColor("Editor Background", 0x282A36);
 			s.setIfAbsentRgbColor("Highlight", 0xFF79C6);
 			s.setIfAbsentRgbColor("Caret", 0xF8F8F2);

enigma/src/main/java/cuchaz/enigma/source/DecompiledClassSource.java

@@ -12,6 +12,7 @@
 import cuchaz.enigma.EnigmaServices;
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.api.service.NameProposalService;
+import cuchaz.enigma.api.service.ObfuscationTestService;
 import cuchaz.enigma.translation.LocalNameGenerator;
 import cuchaz.enigma.translation.TranslateResult;
 import cuchaz.enigma.translation.Translator;
@@ -72,7 +73,11 @@ private String remapToken(TokenStore target, EnigmaProject project, Token token,
 					return proposedName.get();
 				}
 
-				target.add(RenamableTokenType.OBFUSCATED, movedToken);
+				if (isUnobfuscated(project, entry)) {
+					target.add(RenamableTokenType.UNOBFUSCATED, movedToken);
+				} else {
+					target.add(RenamableTokenType.OBFUSCATED, movedToken);
+				}
 			}
 		}
 
@@ -96,6 +101,12 @@ public static Optional<String> proposeName(EnigmaProject project, Entry<?> entry
 		}).findFirst();
 	}
 
+	private static boolean isUnobfuscated(EnigmaProject project, Entry<?> entry) {
+		EnigmaServices services = project.getEnigma().getServices();
+
+		return services.get(ObfuscationTestService.TYPE).stream().anyMatch(service -> service.testDeobfuscated(entry));
+	}
+
 	@Nullable
 	private String generateDefaultName(Entry<?> entry) {
 		if (entry instanceof LocalVariableDefEntry) {

enigma/src/main/java/cuchaz/enigma/source/RenamableTokenType.java

@@ -3,5 +3,6 @@
 public enum RenamableTokenType {
 	OBFUSCATED,
 	DEOBFUSCATED,
-	PROPOSED
+	PROPOSED,
+	UNOBFUSCATED,
 }