Skip to content

Update relative path semantics in PathFileObject #125

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
merged 1 commit into from
Oct 29, 2022
Merged

Update relative path semantics in PathFileObject #125

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
32 changes: 23 additions & 9 deletions java-compiler-testing/src/main/java/io/github/ascopes/jct/compilers/PathFileObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class PathFileObject implements JavaFileObject {
private static final long NOT_MODIFIED = 0L;

private final Location location;
private final Path root;
private final Path rootPath;
private final Path relativePath;
private final Path fullPath;
private final String name;
Expand All @@ -76,14 +76,28 @@ public class PathFileObject implements JavaFileObject {
/**
* Initialize this file object.
*
* @param root the root directory that the path is a package within.
* @param relativePath the path to point to.
* @param rootPath the root directory that the path is a package within.
* @param relativePath the path to point to, relative to the root.
*/
public PathFileObject(Location location, Path root, Path relativePath) {
this.location = requireNonNull(location, "location");
this.root = requireNonNull(root, "root");
this.relativePath = root.relativize(requireNonNull(relativePath, "relativePath"));
fullPath = root.resolve(relativePath);
public PathFileObject(Location location, Path rootPath, Path relativePath) {
requireNonNull(location, "location");
requireNonNull(rootPath, "rootPath");
requireNonNull(relativePath, "relativePath");

if (!rootPath.isAbsolute()) {
throw new IllegalArgumentException("rootPath must be absolute");
}

this.location = location;
this.rootPath = rootPath;

if (relativePath.isAbsolute()) {
this.relativePath = rootPath.relativize(relativePath);
} else {
this.relativePath = relativePath;
}

fullPath = rootPath.resolve(relativePath);
name = relativePath.toString();
uri = fullPath.toUri();
kind = FileUtils.pathToKind(relativePath);
Expand Down Expand Up @@ -150,7 +164,7 @@ public Location getLocation() {
* @return the root path.
*/
public Path getRoot() {
return root;
return rootPath;
}

@Override
Expand Down