1 files changed, 30 insertions, 22 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java b/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
index 93643ab..44f70f8 100644
--- a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
+++ b/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java
@@ -1,21 +1,25 @@
 package cuchaz.enigma.gui;
 
-import cuchaz.enigma.Deobfuscator;
+import cuchaz.enigma.EnigmaProject;
+import cuchaz.enigma.EnigmaServices;
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.analysis.SourceIndex;
 import cuchaz.enigma.analysis.Token;
-import cuchaz.enigma.api.EnigmaPlugin;
+import cuchaz.enigma.api.service.NameProposalService;
 import cuchaz.enigma.gui.highlight.TokenHighlightType;
 import cuchaz.enigma.translation.LocalNameGenerator;
 import cuchaz.enigma.translation.Translator;
+import cuchaz.enigma.translation.mapping.EntryRemapper;
+import cuchaz.enigma.translation.mapping.EntryResolver;
+import cuchaz.enigma.translation.mapping.ResolutionStrategy;
 import cuchaz.enigma.translation.representation.TypeDescriptor;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.translation.representation.entry.FieldEntry;
 import cuchaz.enigma.translation.representation.entry.LocalVariableDefEntry;
 
 import javax.annotation.Nullable;
 import java.util.*;
+import java.util.stream.Stream;
 
 public class DecompiledClassSource {
         private final ClassEntry classEntry;
@@ -35,30 +39,30 @@ public class DecompiledClassSource {
                 return new DecompiledClassSource(classEntry, new SourceIndex(text));
         }
 
-        public void remapSource(Deobfuscator deobfuscator, Translator translator) {
+        public void remapSource(EnigmaProject project, Translator translator) {
                 highlightedTokens.clear();
 
                 SourceRemapper remapper = new SourceRemapper(obfuscatedIndex.getSource(), obfuscatedIndex.referenceTokens());
 
-                SourceRemapper.Result remapResult = remapper.remap((token, movedToken) -> remapToken(deobfuscator, token, movedToken, translator));
+                SourceRemapper.Result remapResult = remapper.remap((token, movedToken) -> remapToken(project, token, movedToken, translator));
                 remappedIndex = obfuscatedIndex.remapTo(remapResult);
         }
 
-        private String remapToken(Deobfuscator deobfuscator, Token token, Token movedToken, Translator translator) {
+        private String remapToken(EnigmaProject project, Token token, Token movedToken, Translator translator) {
                 EntryReference<Entry<?>, Entry<?>> reference = obfuscatedIndex.getReference(token);
 
                 Entry<?> entry = reference.getNameableEntry();
                 Entry<?> translatedEntry = translator.translate(entry);
 
-                if (deobfuscator.isRenamable(reference)) {
+                if (project.isRenamable(reference)) {
                         if (isDeobfuscated(entry, translatedEntry)) {
                                 highlightToken(movedToken, TokenHighlightType.DEOBFUSCATED);
                                 return translatedEntry.getSourceRemapName();
                         } else {
-                                String proposedName = proposeName(deobfuscator, entry);
-                                if (proposedName != null) {
+                                Optional<String> proposedName = proposeName(project, entry);
+                                if (proposedName.isPresent()) {
                                         highlightToken(movedToken, TokenHighlightType.PROPOSED);
-                                        return proposedName;
+                                        return proposedName.get();
                                 }
 
                                 highlightToken(movedToken, TokenHighlightType.OBFUSCATED);
@@ -73,18 +77,22 @@ public class DecompiledClassSource {
                 return null;
         }
 
-        @Nullable
-        private String proposeName(Deobfuscator deobfuscator, Entry<?> entry) {
-                if (entry instanceof FieldEntry) {
-                        for (EnigmaPlugin plugin : deobfuscator.getPlugins()) {
-                                String owner = entry.getContainingClass().getFullName();
-                                String proposal = plugin.proposeFieldName(owner, entry.getName(), ((FieldEntry) entry).getDesc().toString());
-                                if (proposal != null) {
-                                        return proposal;
-                                }
-                        }
-                }
-                return null;
+        private Optional<String> proposeName(EnigmaProject project, Entry<?> entry) {
+                EnigmaServices services = project.getEnigma().getServices();
+
+                return services.get(NameProposalService.TYPE).flatMap(nameProposalService -> {
+                        EntryResolver resolver = project.getMapper().getObfResolver();
+
+                        Collection<Entry<?>> resolved = resolver.resolveEntry(entry, ResolutionStrategy.RESOLVE_ROOT);
+                        EntryRemapper mapper = project.getMapper();
+
+                        Stream<String> proposals = resolved.stream()
+                                        .map(e -> nameProposalService.proposeName(e, mapper))
+                                        .filter(Optional::isPresent)
+                                        .map(Optional::get);
+
+                        return proposals.findFirst();
+                });
         }
 
         @Nullable