Merge pull request #175 from eatkins/jdk9-relativize

Update relativize method for java 9
sbt · Aug 3, 2018 · fb0acb1 · fb0acb1
2 parents 265cba2 + 212b407
commit fb0acb1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/io/src/main/scala/sbt/io/IO.scala b/io/src/main/scala/sbt/io/IO.scala
@@ -608,12 +608,14 @@ object IO {
    * If `file` or `base` are not absolute, they are first resolved against the current working directory.
    */
   def relativize(base: File, file: File): Option[String] = {
-    val basePath = (if (base.isAbsolute) base else base.getCanonicalFile).toPath
-    val filePath = (if (file.isAbsolute) file else file.getCanonicalFile).toPath
-    if ((filePath startsWith basePath) || (filePath.normalize() startsWith basePath.normalize())) {
+    val basePath = (if (base.isAbsolute) base else base.getCanonicalFile).toPath.normalize()
+    val filePath = (if (file.isAbsolute) file else file.getCanonicalFile).toPath.normalize()
+    if (filePath startsWith basePath) {
       val relativePath = catching(classOf[IllegalArgumentException]) opt (basePath relativize filePath)
       relativePath map (_.toString)
-    } else None
+    } else {
+      None
+    }
   }
 
   def copy(sources: Traversable[(File, File)]): Set[File] = copy(sources, CopyOptions())

diff --git a/io/src/test/scala/sbt/io/IOSpec.scala b/io/src/test/scala/sbt/io/IOSpec.scala
@@ -22,7 +22,7 @@ class IOSpec extends FlatSpec with Matchers {
     val relativeRootDir = new File(nestedDir, "..")
 
     IO.relativize(rootDir.toFile, nestedFile).map(file) shouldBe Some(file("meh.file"))
-    IO.relativize(relativeRootDir, nestedFile).map(file) shouldBe Some(file("../../meh.file"))
+    IO.relativize(relativeRootDir, nestedFile).map(file) shouldBe Some(file("meh.file"))
   }
 
   it should "relativize . dirs" in {