Consolidate embedded resource path generation edge case to fix UI breakages with embedded contents

Author: Col-E

recaf-core/src/main/java/software/coley/recaf/path/PathNode.java

@@ -70,7 +70,9 @@ default PathNode withCurrentWorkspaceContent() {
 	 * @return {@code true} when the other path has the same {@link #getValue() local value}.
 	 */
 	default boolean hasEqualOrChildValue(@Nonnull PathNode<?> other) {
-		return this == other || getValue().equals(other.getValue());
+		V value = getValue();
+		Object otherValue = other.getValue();
+		return this == other || value == otherValue || value.equals(otherValue);
 	}
 
 	/**

recaf-core/src/main/java/software/coley/recaf/path/PathNodes.java

@@ -57,16 +57,7 @@ public static WorkspacePathNode workspacePath(@Nonnull Workspace workspace) {
 	@Nonnull
 	public static ResourcePathNode resourcePath(@Nonnull Workspace workspace,
 	                                            @Nonnull WorkspaceResource resource) {
-		// Base case, resource is top-level in the workspace.
-		WorkspaceResource containingResource = resource.getContainingResource();
-		if (containingResource == null)
-			return workspacePath(workspace).child(resource);
-
-		// Resource is embedded, so we need to represent the path a bit differently.
-		WorkspaceResource rootResource = containingResource;
-		while (rootResource.getContainingResource() != null)
-			rootResource = rootResource.getContainingResource();
-		return workspacePath(workspace).child(rootResource).embeddedChildContainer().child(resource);
+		return workspacePath(workspace).child(resource);
 	}
 
 	/**

recaf-core/src/main/java/software/coley/recaf/path/ResourcePathNode.java

@@ -90,10 +90,29 @@ public EmbeddedResourceContainerPathNode embeddedChildContainer() {
 	 */
 	public boolean isPrimary() {
 		PathNode<Workspace> parent = getParent();
-		if (parent == null) return false;
+		if (parent == null)
+			return false;
 		return parent.getValue().getPrimaryResource() == getValue();
 	}
 
+	/**
+	 * @return {@code true} when this resource node, wraps the primary resource of a workspace or any resource embedded in the primary resource.
+	 */
+	public boolean isPrimaryOrEmbeddedInPrimary() {
+		PathNode<Workspace> parent = getParent();
+		if (parent == null)
+			return false;
+		Workspace workspace = parent.getValue();
+		WorkspaceResource primary = workspace.getPrimaryResource();
+		WorkspaceResource resource = getValue();
+		while (resource != null) {
+			if (primary == resource)
+				return true;
+			resource = resource.getContainingResource();
+		}
+		return false;
+	}
+
 	@Nonnull
 	@Override
 	public Set<String> directParentTypeIds() {

recaf-core/src/main/java/software/coley/recaf/path/WorkspacePathNode.java

@@ -32,11 +32,24 @@ public WorkspacePathNode(@Nonnull Workspace value) {
 	 * @param resource
 	 * 		Resource to wrap into node.
 	 *
-	 * @return Path node of resource, with the current workspace as parent.
+	 * @return Path node of resource, with the current workspace as parent,
+	 * or a {@link EmbeddedResourceContainerPathNode} if the passed resource is an embedded resource.
 	 */
 	@Nonnull
 	public ResourcePathNode child(@Nonnull WorkspaceResource resource) {
-		return new ResourcePathNode(this, resource);
+		// Base case, resource is top-level in the workspace.
+		WorkspaceResource containingResource = resource.getContainingResource();
+		if (containingResource == null)
+			return new ResourcePathNode(this, resource);
+
+		// Resource is embedded, so we need to represent the path a bit differently.
+		// - Note: We flatten the representation of embedded resources here.
+		WorkspaceResource rootResource = containingResource;
+		while (rootResource.getContainingResource() != null)
+			rootResource = rootResource.getContainingResource();
+		return new ResourcePathNode(this, rootResource)
+				.embeddedChildContainer()
+				.child(resource);
 	}
 
 	@Nonnull

recaf-core/src/main/java/software/coley/recaf/services/inheritance/InheritanceGraph.java

@@ -415,7 +415,7 @@ private InheritanceVertex createVertex(@Nullable String name) {
 
 		// Map class to vertex.
 		ResourcePathNode resourcePath = result.getPathOfType(WorkspaceResource.class);
-		boolean isPrimary = resourcePath != null && resourcePath.isPrimary();
+		boolean isPrimary = resourcePath != null && resourcePath.isPrimaryOrEmbeddedInPrimary();
 		ClassInfo info = result.getValue();
 		return new InheritanceVertex(info, this::getVertex, this::getDirectChildren, isPrimary);
 	}