Skip to content

Fix #9186: Only warn when the path cannot be relativized #9188

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
Jun 16, 2020
Merged

Fix #9186: Only warn when the path cannot be relativized #9188

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: 12 additions & 5 deletions compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,18 @@ class PositionPickler(pickler: TastyPickler, addrOfTree: untpd.Tree => Addr) {
def pickleSource(source: SourceFile): Unit = {
buf.writeInt(SOURCE)
val pathName = source.path
val path = java.nio.file.Paths.get(pathName.toString).toAbsolutePath().normalize()
val cwd = java.nio.file.Paths.get("").toAbsolutePath().normalize()
val relativePath = (cwd.relativize(path))
assert(!relativePath.isAbsolute)
buf.writeInt(pickler.nameBuffer.nameIndex(relativePath.toString.toTermName).index)
val pickledPath =
val originalPath = java.nio.file.Paths.get(pathName.toString).normalize()
if originalPath.isAbsolute then
val path = originalPath.toAbsolutePath().normalize()
val cwd = java.nio.file.Paths.get("").toAbsolutePath().normalize()
try cwd.relativize(path)
catch case _: IllegalArgumentException =>
ctx.warning("Could not relativize path for pickling: " + originalPath)
originalPath
else
originalPath
buf.writeInt(pickler.nameBuffer.nameIndex(pickledPath.toString.toTermName).index)
}

/** True if x's position shouldn't be reconstructed automatically from its initial span
Expand Down