Revert "graaaah"

This reverts commit 4a1a27c.

enigma/src/main/java/org/quiltmc/enigma/api/Enigma.java

@@ -5,7 +5,6 @@
 import org.quiltmc.enigma.api.analysis.index.jar.LibrariesJarIndex;
 import org.quiltmc.enigma.api.analysis.index.jar.MainJarIndex;
 import org.quiltmc.enigma.api.analysis.index.mapping.MappingsIndex;
-import org.quiltmc.enigma.api.class_provider.ProjectClassProvider;
 import org.quiltmc.enigma.impl.analysis.ClassLoaderClassProvider;
 import org.quiltmc.enigma.api.service.EnigmaService;
 import org.quiltmc.enigma.api.service.EnigmaServiceContext;
@@ -44,11 +43,13 @@
 import java.sql.DriverManager;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class Enigma {
@@ -84,10 +85,14 @@ public EnigmaProject openJar(Path path, ClassProvider libraryClassProvider, Prog
 		ClassLoaderClassProvider jreProvider = new ClassLoaderClassProvider(DriverManager.class.getClassLoader());
 		CombiningClassProvider librariesProvider = new CombiningClassProvider(jreProvider, libraryClassProvider);
 		ClassProvider mainProjectProvider = new ObfuscationFixClassProvider(new CachingClassProvider(jarClassProvider), index);
-		ProjectClassProvider projectClassProvider = new ProjectClassProvider(mainProjectProvider, librariesProvider);
+
+		Set<String> mainScope = new HashSet<>(mainProjectProvider.getClassNames());
+		Set<String> librariesScope = new HashSet<>(librariesProvider.getClassNames());
 
 		// main index
-		this.index(index, projectClassProvider, progress);
+		this.index(index, mainProjectProvider, mainScope, progress, false);
+		// lib index
+		this.index(libIndex, librariesProvider, librariesScope, progress, true);
 
 		// name proposal
 		var nameProposalServices = this.getNameProposalServices();
@@ -119,19 +124,22 @@ public EnigmaProject openJar(Path path, ClassProvider libraryClassProvider, Prog
 		return new EnigmaProject(this, path, mainProjectProvider, index, libIndex, mappingsIndex, proposedNames, Utils.zipSha1(path));
 	}
 
-	private void index(JarIndex index, ProjectClassProvider classProvider, ProgressListener progress) {
-		index.indexJar(classProvider, progress);
+	private void index(JarIndex index, ClassProvider classProvider, Set<String> scope, ProgressListener progress, boolean libraries) {
+		String progressKey = libraries ? "libs" : "jar";
+		index.indexJar(scope, classProvider, progress);
 
 		List<JarIndexerService> indexers = this.services.get(JarIndexerService.TYPE);
-		progress.init(indexers.size(), I18n.translate("progress.jar.custom_indexing"));
+		progress.init(indexers.size(), I18n.translate("progress." + progressKey + ".custom_indexing"));
 
 		int i = 1;
 		for (var service : indexers) {
-			progress.step(i++, I18n.translateFormatted("progress.jar.custom_indexing.indexer", service.getId()));
-			service.acceptJar(classProvider, index);
+			if (!(libraries && !service.shouldIndexLibraries())) {
+				progress.step(i++, I18n.translateFormatted("progress." + progressKey + ".custom_indexing.indexer", service.getId()));
+				service.acceptJar(scope, classProvider, index);
+			}
 		}
 
-		progress.step(i, I18n.translate("progress.jar.custom_indexing.finished"));
+		progress.step(i, I18n.translate("progress." + progressKey + ".custom_indexing.finished"));
 	}
 
 	public EnigmaProfile getProfile() {

enigma/src/main/java/org/quiltmc/enigma/api/analysis/index/jar/JarIndex.java

@@ -2,11 +2,13 @@
 
 import com.google.common.collect.ListMultimap;
 import org.quiltmc.enigma.api.ProgressListener;
-import org.quiltmc.enigma.api.class_provider.ProjectClassProvider;
+import org.quiltmc.enigma.api.class_provider.ClassProvider;
 import org.quiltmc.enigma.api.translation.mapping.EntryResolver;
 import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry;
 import org.quiltmc.enigma.api.translation.representation.entry.ParentedEntry;
 
+import java.util.Set;
+
 public interface JarIndex extends JarIndexer {
 	/**
 	 * Gets the index associated with the provided class.
@@ -17,10 +19,11 @@ public interface JarIndex extends JarIndexer {
 
 	/**
 	 * Runs every configured indexer over the provided jar.
-	 * @param classProvider a class provider containing all classes in the jar and libraries
+	 * @param classNames the obfuscated names of each class in the jar
+	 * @param classProvider a class provider containing all classes in the jar
 	 * @param progress a progress listener to track index completion
 	 */
-	void indexJar(ProjectClassProvider classProvider, ProgressListener progress);
+	void indexJar(Set<String> classNames, ClassProvider classProvider, ProgressListener progress);
 
 	/**
 	 * {@return an entry resolver with this index's contents as context}

enigma/src/main/java/org/quiltmc/enigma/api/analysis/index/jar/LibrariesJarIndex.java

@@ -1,7 +1,5 @@
 package org.quiltmc.enigma.api.analysis.index.jar;
 
-import org.quiltmc.enigma.api.ProgressListener;
-import org.quiltmc.enigma.api.class_provider.ProjectClassProvider;
 import org.quiltmc.enigma.impl.analysis.index.AbstractJarIndex;
 
 public class LibrariesJarIndex extends AbstractJarIndex {
@@ -24,9 +22,4 @@ public static JarIndex empty() {
 	public String getTranslationKey() {
 		return "progress.jar.indexing.libraries";
 	}
-
-	@Override
-	public void indexJar(ProjectClassProvider classProvider, ProgressListener progress) {
-		this.indexJar(classProvider.getLibraryClassNames(), classProvider, progress);
-	}
 }

enigma/src/main/java/org/quiltmc/enigma/api/analysis/index/jar/MainJarIndex.java

@@ -1,7 +1,5 @@
 package org.quiltmc.enigma.api.analysis.index.jar;
 
-import org.quiltmc.enigma.api.ProgressListener;
-import org.quiltmc.enigma.api.class_provider.ProjectClassProvider;
 import org.quiltmc.enigma.impl.analysis.index.AbstractJarIndex;
 
 public class MainJarIndex extends AbstractJarIndex {
@@ -28,9 +26,4 @@ public static JarIndex empty() {
 	public String getTranslationKey() {
 		return "progress.jar.indexing.jar";
 	}
-
-	@Override
-	public void indexJar(ProjectClassProvider classProvider, ProgressListener progress) {
-		this.indexJar(classProvider.getMainClassNames(), classProvider, progress);
-	}
 }

enigma/src/main/java/org/quiltmc/enigma/api/class_provider/ObfuscationFixClassProvider.java

@@ -45,7 +45,7 @@ public ObfuscationFixClassProvider(ClassProvider classProvider, JarIndex jarInde
 	public ClassNode get(String name) {
 		ClassNode node = this.classProvider.get(name);
 
-		if (!this.jarIndex.isIndexed(name) || node == null) {
+		if (!this.jarIndex.isIndexed(name)) {
 			return node;
 		}
 

enigma/src/main/java/org/quiltmc/enigma/api/service/JarIndexerService.java

@@ -2,8 +2,11 @@
 
 import org.objectweb.asm.tree.ClassNode;
 import org.quiltmc.enigma.api.analysis.index.jar.JarIndex;
+import org.quiltmc.enigma.api.class_provider.ClassProvider;
 import org.objectweb.asm.ClassVisitor;
-import org.quiltmc.enigma.api.class_provider.ProjectClassProvider;
+
+import javax.annotation.Nullable;
+import java.util.Set;
 
 /**
  * Jar indexer services analyse jar files as they're opened to collect information about their contents.
@@ -13,12 +16,35 @@
 public interface JarIndexerService extends EnigmaService {
 	EnigmaServiceType<JarIndexerService> TYPE = EnigmaServiceType.create("jar_indexer");
 
+	/**
+	 * Checks the {@code index_libraries} argument in the context to determine if libraries should be indexed.
+	 * @param context the context for this service
+	 * @return whether libraries should be indexed
+	 */
+	static boolean shouldIndexLibraries(@Nullable EnigmaServiceContext<JarIndexerService> context) {
+		if (context == null) {
+			return false;
+		}
+
+		return context.getSingleArgument("index_libraries").map(Boolean::parseBoolean).orElse(false);
+	}
+
 	/**
 	 * Indexes a collection of classes.
-	 * @param classProvider a provider to translate class names into {@link ClassNode class nodes}.
+	 * @param scope a list of class names to be indexed
+	 * @param classProvider a provider to translate class names into {@link ClassNode class nodes}
 	 * @param jarIndex the current jar index
 	 */
-	void acceptJar(ProjectClassProvider classProvider, JarIndex jarIndex);
+	void acceptJar(Set<String> scope, ClassProvider classProvider, JarIndex jarIndex);
+
+	/**
+	 * Whether this indexer should be run on libraries in addition to the main project being indexed.
+	 * @implNote implementations should use {@link #shouldIndexLibraries(EnigmaServiceContext)} to allow changing this setting via the {@link org.quiltmc.enigma.api.EnigmaProfile profile}
+	 * @return whether this indexer should target libraries
+	 */
+	default boolean shouldIndexLibraries() {
+		return false;
+	}
 
 	/**
 	 * Creates an indexer service that runs all {@link ClassNode class nodes} through the provided {@link ClassVisitor visitor}.
@@ -27,10 +53,24 @@ public interface JarIndexerService extends EnigmaService {
 	 * @return the indexer service
 	 */
 	static JarIndexerService fromVisitor(ClassVisitor visitor, String id) {
+		return fromVisitor(null, visitor, id);
+	}
+
+	/**
+	 * Creates an indexer service that runs all {@link ClassNode class nodes} through the provided {@link ClassVisitor visitor}.
+	 * Overrides {@link #shouldIndexLibraries()} according to the profile argument described in {@link #shouldIndexLibraries(EnigmaServiceContext)}.
+	 * @param context the profile context for the service
+	 * @param visitor the visitor to pass classes through
+	 * @param id the service's ID
+	 * @return the indexer service
+	 */
+	static JarIndexerService fromVisitor(@Nullable EnigmaServiceContext<JarIndexerService> context, ClassVisitor visitor, String id) {
+		boolean indexLibs = shouldIndexLibraries(context);
+
 		return new JarIndexerService() {
 			@Override
-			public void acceptJar(ProjectClassProvider classProvider, JarIndex jarIndex) {
-				for (String className : classProvider.getClassNames()) {
+			public void acceptJar(Set<String> scope, ClassProvider classProvider, JarIndex jarIndex) {
+				for (String className : scope) {
 					ClassNode node = classProvider.get(className);
 					if (node != null) {
 						node.accept(visitor);
@@ -42,6 +82,11 @@ public void acceptJar(ProjectClassProvider classProvider, JarIndex jarIndex) {
 			public String getId() {
 				return id;
 			}
+
+			@Override
+			public boolean shouldIndexLibraries() {
+				return indexLibs;
+			}
 		};
 	}
 }

enigma/src/main/java/org/quiltmc/enigma/impl/analysis/index/AbstractJarIndex.java

@@ -25,7 +25,6 @@
 import org.quiltmc.enigma.api.translation.representation.entry.ParentedEntry;
 import org.quiltmc.enigma.util.I18n;
 
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -73,10 +72,11 @@ public <T extends JarIndexer> T getIndex(Class<T> clazz) {
 
 	/**
 	 * Runs every configured indexer over the provided jar.
+	 * @param classNames the obfuscated names of each class in the jar
 	 * @param classProvider a class provider containing all classes in the jar
 	 * @param progress a progress listener to track index completion
 	 */
-	public void indexJar(Collection<String> classNames, ClassProvider classProvider, ProgressListener progress) {
+	public void indexJar(Set<String> classNames, ClassProvider classProvider, ProgressListener progress) {
 		// for use in processIndex
 		this.progress = progress;
 

enigma/src/main/java/org/quiltmc/enigma/impl/plugin/BuiltinPlugin.java

@@ -34,7 +34,7 @@ private static void registerEnumNamingService(EnigmaPluginContext ctx) {
 		final Map<Entry<?>, String> names = new HashMap<>();
 		final EnumFieldNameFindingVisitor visitor = new EnumFieldNameFindingVisitor(names);
 
-		ctx.registerService(JarIndexerService.TYPE, ctx1 -> JarIndexerService.fromVisitor(visitor, "enigma:enum_initializer_indexer"));
+		ctx.registerService(JarIndexerService.TYPE, ctx1 -> JarIndexerService.fromVisitor(ctx1, visitor, "enigma:enum_initializer_indexer"));
 
 		ctx.registerService(NameProposalService.TYPE, ctx1 -> new NameProposalService() {
 			@Override
@@ -66,7 +66,7 @@ private static void registerRecordNamingService(EnigmaPluginContext ctx) {
 		final Map<FieldEntry, MethodEntry> fieldToGetter = new HashMap<>();
 		final RecordGetterFindingVisitor visitor = new RecordGetterFindingVisitor(fieldToGetter);
 
-		ctx.registerService(JarIndexerService.TYPE, ctx1 -> JarIndexerService.fromVisitor(visitor, "enigma:record_component_indexer"));
+		ctx.registerService(JarIndexerService.TYPE, ctx1 -> JarIndexerService.fromVisitor(ctx1, visitor, "enigma:record_component_indexer"));
 		ctx.registerService(NameProposalService.TYPE, ctx1 -> new RecordComponentProposalService(fieldToGetter));
 	}
 

enigma/src/test/java/org/quiltmc/enigma/PackageVisibilityIndexTest.java

@@ -4,9 +4,7 @@
 import org.quiltmc.enigma.api.analysis.index.jar.MainJarIndex;
 import org.quiltmc.enigma.api.analysis.index.jar.PackageVisibilityIndex;
 import org.quiltmc.enigma.api.ProgressListener;
-import org.quiltmc.enigma.api.class_provider.CachingClassProvider;
 import org.quiltmc.enigma.api.class_provider.JarClassProvider;
-import org.quiltmc.enigma.api.class_provider.ProjectClassProvider;
 import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry;
 import org.junit.jupiter.api.Test;
 
@@ -29,7 +27,7 @@ public class PackageVisibilityIndexTest {
 	public PackageVisibilityIndexTest() throws Exception {
 		JarClassProvider jcp = new JarClassProvider(JAR);
 		this.jarIndex = MainJarIndex.empty();
-		this.jarIndex.indexJar(new ProjectClassProvider(new CachingClassProvider(jcp), null), ProgressListener.createEmpty());
+		this.jarIndex.indexJar(jcp.getClassNames(), jcp, ProgressListener.createEmpty());
 	}
 
 	@Test

enigma/src/test/java/org/quiltmc/enigma/TestInnerClasses.java

@@ -6,7 +6,6 @@
 import org.quiltmc.enigma.api.analysis.index.jar.MainJarIndex;
 import org.quiltmc.enigma.api.class_provider.CachingClassProvider;
 import org.quiltmc.enigma.api.class_provider.JarClassProvider;
-import org.quiltmc.enigma.api.class_provider.ProjectClassProvider;
 import org.quiltmc.enigma.api.source.Decompiler;
 import org.quiltmc.enigma.api.source.Decompilers;
 import org.quiltmc.enigma.api.source.SourceSettings;
@@ -35,7 +34,7 @@ public TestInnerClasses() throws Exception {
 		JarClassProvider jcp = new JarClassProvider(JAR);
 		CachingClassProvider classProvider = new CachingClassProvider(jcp);
 		this.index = MainJarIndex.empty();
-		this.index.indexJar(new ProjectClassProvider(classProvider, null), ProgressListener.createEmpty());
+		this.index.indexJar(jcp.getClassNames(), classProvider, ProgressListener.createEmpty());
 		this.decompiler = Decompilers.CFR.create(classProvider, new SourceSettings(false, false));
 	}