Skip to content

8352645: Add tool support to check order of includes #24247

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

Closed
wants to merge 12 commits into from
Closed

8352645: Add tool support to check order of includes #24247

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a76d4f9
do not reorder certain includes
dougxc Mar 25, 2025
d4d367a
added tool to sort includes
dougxc Mar 26, 2025
6277947
sort includes in subset of HotSpot sources and added a test to keep t…
dougxc Mar 26, 2025
18e2a1d
drop extra blank lines and preserve rule for first include in .inline…
dougxc Mar 26, 2025
807374e
update style guide with advice on how to label includes that should n…
dougxc Mar 27, 2025
da06409
removed extra blank lines
dougxc Mar 27, 2025
632ed38
moved some logic out of SortIncludes into TestIncludesAreSorted
dougxc Mar 27, 2025
cada0df
allow spaces between `#` and `include`
dougxc Mar 27, 2025
3819f86
remove trailing spaces
dougxc Mar 27, 2025
93770e7
moved test/hotspot/jtreg/sources into tier1_common
dougxc Mar 27, 2025
c93e664
moved error message into UnsortedIncludesException
dougxc Mar 27, 2025
921e325
convert Windows path to Unix path
dougxc Mar 28, 2025
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
4 changes: 4 additions & 0 deletions test/hotspot/jtreg/sources/SortIncludes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* questions.
*/

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -81,6 +82,9 @@ private static String sortedIncludes(Path path, String block) {
String pathString = path.toString();
boolean isInlineHpp = pathString.endsWith(".inline.hpp");
String nonInlineHpp = pathString.replace(".inline.hpp", ".hpp");
if (File.separatorChar != '/') {
nonInlineHpp = nonInlineHpp.replace(File.separatorChar, '/');
}

List<String> result = new ArrayList<>(lines.length);

Expand Down