Skip to content
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

Jump to bottom

Fix class ordering when propagating type annotations #290

Merged
merged 1 commit into from
Dec 2, 2022
Merged

Fix class ordering when propagating type annotations #290

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions core/src/main/java/org/jboss/jandex/Indexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2448,14 +2448,18 @@ private boolean isEnclosedIn(ClassInfo c1, ClassInfo c2) {

@Override
public int compare(ClassInfo c1, ClassInfo c2) {
if (isEnclosedIn(c1, c2)) {
if (c1.name().equals(c2.name())) {
return 0;
} else if (isEnclosedIn(c1, c2)) {
// c1 is enclosed in c2, so c2 must be processed sooner
return 1;
} else if (isEnclosedIn(c2, c1)) {
// c2 is enclosed in c1, so c1 must be processed sooner
return -1;
} else {
return 0;
// we really only need partial order here,
// but `Comparator` must establish total order
return c1.name().compareTo(c2.name());
}
}
});
Expand Down