Improve some implementations based on java Paths

Author: nicolasstucki

compiler/src/dotty/tools/io/Directory.scala

@@ -48,13 +48,9 @@ class Directory(jpath: JPath) extends Path(jpath) {
 
   /** An iterator over the contents of this directory.
    */
-  def list: Iterator[Path] = {
-    try {
-      Files.list(jpath).toArray[JPath](n => new Array(n)).iterator.map(Path.apply)
-    } catch {
-      case _: java.nio.file.NoSuchFileException => Iterator.empty
-    }
-  }
+  def list: Iterator[Path] =
+    if (isDirectory) Files.list(jpath).iterator.asScala.map(Path.apply)
+    else Iterator.empty
 
   def dirs: Iterator[Directory] = list collect { case x: Directory => x }
   def files: Iterator[File] = list collect { case x: File => x }

compiler/src/dotty/tools/io/Path.scala

@@ -7,8 +7,12 @@ package dotty.tools.io
 
 import scala.language.implicitConversions
 import java.io.RandomAccessFile
-import java.nio.file.{DirectoryNotEmptyException, FileAlreadyExistsException, Files, NoSuchFileException, Paths}
+import java.nio.file._
 import java.net.{URI, URL}
+import java.nio.file.attribute.BasicFileAttributes
+import java.io.IOException
+
+import scala.collection.JavaConverters._
 
 import scala.util.Random.alphanumeric
 
@@ -51,7 +55,7 @@ object Path {
   def onlyDirs(xs: List[Path]): List[Directory] = xs filter (_.isDirectory) map (_.toDirectory)
   def onlyFiles(xs: Iterator[Path]): Iterator[File] = xs filter (_.isFile) map (_.toFile)
 
-  def roots: List[Path] = java.io.File.listRoots().toList.map(r => Path.apply(r.toPath))
+  def roots: List[Path] = FileSystems.getDefault.getRootDirectories.iterator().asScala.map(Path.apply).toList
 
   def apply(path: String): Path = apply(Paths.get(path))
   def apply(jpath: JPath): Path = try {
@@ -221,22 +225,30 @@ class Path private[io] (val jpath: JPath) {
     try { create; true } catch { case _: FileAlreadyExistsException => false }
 
   // deletions
-  def delete(): Unit = delete(jpath)
+  def delete(): Unit =
+    try { Files.deleteIfExists(jpath) } catch { case _: DirectoryNotEmptyException => }
 
   /** Deletes the path recursively. Returns false on failure.
    *  Use with caution!
    */
-  def deleteRecursively(): Boolean = deleteRecursively(jpath)
-  private def deleteRecursively(p: JPath): Boolean = {
-    import scala.collection.JavaConverters._
-    if (Files.isDirectory(p))
-      Files.list(p).iterator().asScala.foreach(deleteRecursively)
-    delete(p)
+  def deleteRecursively(): Boolean = {
+    if (!exists) false
+    else {
+      Files.walkFileTree(jpath, new SimpleFileVisitor[JPath]() {
+        override def visitFile(file: JPath, attrs: BasicFileAttributes) = {
+          Files.delete(file)
+          FileVisitResult.CONTINUE
+        }
+
+        override def postVisitDirectory(dir: JPath, exc: IOException) = {
+          Files.delete(dir)
+          FileVisitResult.CONTINUE
+        }
+      })
+      true
+    }
   }
 
-  private def delete(path: JPath): Boolean =
-    try { Files.deleteIfExists(path); true } catch { case _: DirectoryNotEmptyException => false }
-
   def truncate() =
     isFile && {
       val raf = new RandomAccessFile(jpath.toFile, "rw")