Skip to content

Sort entries by test attribute #1834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laeubi merged 1 commit into from
Jun 23, 2025
Merged

Sort entries by test attribute #1834

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...eclipse.pde.core/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Expand All @@ -41,6 +42,7 @@
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.JavaCore;
Expand Down Expand Up @@ -137,10 +139,25 @@ public IClasspathEntry[] getClasspathEntries() {
System.out.println("\t" + entry); //$NON-NLS-1$
}
}
// see for example
// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/4133
// we need to make sure that regular entries are before test
// entries, this is also the "natural" order of items in regular
// classpath
Arrays.sort(fEntries, Comparator.comparingInt(cpe -> isTestEntry(cpe) ? 1 : 0));
}
return fEntries;
}

private boolean isTestEntry(IClasspathEntry cpe) {
for (IClasspathAttribute attr : cpe.getExtraAttributes()) {
if (IClasspathAttribute.TEST.equals(attr.getName())) {
return Boolean.parseBoolean(attr.getValue());
}
}
return false;
}

private IClasspathEntry[] computePluginEntriesByProject() {
try {
Optional<Project> bndProject = BndProjectManager.getBndProject(project);
Expand Down
Loading