Fix regression in ProjectTypeContainer package discovery

Co-authored-by: laeubi <[email protected]>

Author: Copilot

apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/compatibility/ProjectTypeContainerTests.java

@@ -250,4 +250,36 @@ public void visit(String packageName, IApiTypeRoot typeroot) {
 		assertThat(pkgNames).containsAll(getAllPackageNames());
 	}
 
+	/**
+	 * Tests that packages are correctly discovered in projects with multiple
+	 * source folders that share the same output folder. This is a regression
+	 * test for issue #2096 where packages were missing when multiple source
+	 * folders output to the same location.
+	 */
+	public void testMultipleSourceFoldersWithSharedOutput() throws CoreException {
+		IApiComponent component = getComponent("bundle.multisource"); //$NON-NLS-1$
+		IApiTypeContainer[] containers = component.getApiTypeContainers();
+		assertEquals("Wrong number of API type containers", 1, containers.length); //$NON-NLS-1$
+		IApiTypeContainer container = containers[0];
+		assertEquals("Should be a composite type container", IApiTypeContainer.COMPOSITE, //$NON-NLS-1$
+				container.getContainerType());
+
+		String[] packageNames = container.getPackageNames();
+		Set<String> pkgSet = new HashSet<>();
+		for (String pkg : packageNames) {
+			pkgSet.add(pkg);
+		}
+
+		// Both packages from different source folders should be found
+		assertTrue("Missing package test.pkg1 from src1 folder", pkgSet.contains("test.pkg1")); //$NON-NLS-1$ //$NON-NLS-2$
+		assertTrue("Missing package test.pkg2 from src2 folder", pkgSet.contains("test.pkg2")); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Verify we can find types from both source folders
+		IApiTypeRoot type1 = container.findTypeRoot("test.pkg1.TestClass1"); //$NON-NLS-1$
+		assertNotNull("Should find TestClass1 from src1", type1); //$NON-NLS-1$
+
+		IApiTypeRoot type2 = container.findTypeRoot("test.pkg2.TestClass2"); //$NON-NLS-1$
+		assertNotNull("Should find TestClass2 from src2", type2); //$NON-NLS-1$
+	}
+
 }

apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.multisource/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src1"/>
+	<classpathentry kind="src" path="src2"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.multisource/.project

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bundle.multisource</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>

apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.multisource/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=17

apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.multisource/META-INF/MANIFEST.MF

@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Multi Source Test Bundle
+Bundle-SymbolicName: bundle.multisource
+Bundle-Version: 1.0.0
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+Export-Package: test.pkg1,
+ test.pkg2

apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.multisource/build.properties

@@ -0,0 +1,5 @@
+source.. = src1/,\
+           src2/
+output.. = bin/
+bin.includes = META-INF/,\
+               .

apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.multisource/src1/test/pkg1/TestClass1.java

@@ -0,0 +1,10 @@
+package test.pkg1;
+
+/**
+ * Test class in source folder 1
+ */
+public class TestClass1 {
+	public void method1() {
+		// Test method
+	}
+}

apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.multisource/src2/test/pkg2/TestClass2.java

@@ -0,0 +1,10 @@
+package test.pkg2;
+
+/**
+ * Test class in source folder 2
+ */
+public class TestClass2 {
+	public void method2() {
+		// Test method
+	}
+}

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/CompositeApiTypeContainer.java

@@ -39,6 +39,11 @@ public CompositeApiTypeContainer(IApiElement parent, List<IApiTypeContainer> con
 		this.fContainers = containers;
 	}
 
+	@Override
+	public int getContainerType() {
+		return COMPOSITE;
+	}
+
 	@Override
 	protected List<IApiTypeContainer> createApiTypeContainers() throws CoreException {
 		return fContainers;

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectComponent.java

@@ -14,6 +14,7 @@
 package org.eclipse.pde.api.tools.internal.model;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -418,6 +419,30 @@ private static IApiTypeContainer getApiTypeContainer(String location, ProjectCom
 						}
 						cfc = new ProjectTypeContainer(component, container, root);
 						outputLocationToContainer.put(outputLocation, cfc);
+					} else {
+						// Multiple source folders share the same output location
+						// Create a composite container to include packages from all source roots
+						List<IApiTypeContainer> containers = new ArrayList<>();
+						if (cfc instanceof CompositeApiTypeContainer) {
+							// Already a composite, add to it
+							IApiTypeContainer[] typeContainers = ((CompositeApiTypeContainer) cfc)
+									.getApiTypeContainers();
+							containers.addAll(Arrays.asList(typeContainers));
+						} else {
+							// Convert single container to composite
+							containers.add(cfc);
+						}
+						// Add new container for this source root
+						IPath projectFullPath = project.getProject().getFullPath();
+						IContainer container = null;
+						if (projectFullPath.equals(outputLocation)) {
+							container = project.getProject();
+						} else {
+							container = project.getProject().getWorkspace().getRoot().getFolder(outputLocation);
+						}
+						containers.add(new ProjectTypeContainer(component, container, root));
+						cfc = new CompositeApiTypeContainer(component, containers);
+						outputLocationToContainer.put(outputLocation, cfc);
 					}
 					return cfc;
 				}