Make outputDir a PathSetting

Author: allanrenucci

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -52,15 +52,15 @@ class GenBCode extends Phase {
   private[this] var jarFS: JarFS = _
 
   def outputDir(implicit ctx: Context): AbstractFile = {
-    val path = ctx.settings.outputDir.value
-    if (path.isDirectory) new PlainDirectory(path.toDirectory)
-    else {
+    val path = Directory(ctx.settings.outputDir.value)
+    if (path.extension == "jar") {
       if (jarFS == null) {
         path.delete()
         jarFS = JarFS.create(path)
       }
       jarFS.getRoot()
     }
+    else new PlainDirectory(path)
   }
 
   def run(implicit ctx: Context): Unit = {

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -18,7 +18,7 @@ class ScalaSettings extends Settings.SettingGroup {
   val javaextdirs = PathSetting("-javaextdirs", "Override java extdirs classpath.", Defaults.javaExtDirs)
   val sourcepath = PathSetting("-sourcepath", "Specify location(s) of source files.", "") // Defaults.scalaSourcePath
   val classpath = PathSetting("-classpath", "Specify where to find user class files.", defaultClasspath) withAbbreviation "-cp"
-  val outputDir = DirectoryJarSetting("-d", "directory|jar", "destination for generated classfiles.", Directory("."))
+  val outputDir = PathSetting("-d", "directory|jar", "destination for generated classfiles.", ".")
   val priorityclasspath = PathSetting("-priorityclasspath", "class path that takes precedence over all other paths (or testing only)", "")
 
   /** Other settings */

compiler/src/dotty/tools/dotc/config/Settings.scala

@@ -6,7 +6,7 @@ import scala.util.{ Try, Success, Failure }
 import reflect.ClassTag
 import core.Contexts._
 import scala.annotation.tailrec
-import dotty.tools.io.{ Directory, Path }
+import dotty.tools.io.{ Directory, File, Path }
 
 // import annotation.unchecked
   // Dotty deviation: Imports take precedence over definitions in enclosing package
@@ -22,7 +22,6 @@ object Settings {
   val ListTag = ClassTag(classOf[List[_]])
   val VersionTag = ClassTag(classOf[ScalaVersion])
   val OptionTag = ClassTag(classOf[Option[_]])
-  val DirectoryJarTag = ClassTag(classOf[Path])
 
   class SettingsState(initialValues: Seq[Any]) {
     private[this] var values = ArrayBuffer(initialValues: _*)
@@ -141,6 +140,15 @@ object Settings {
           else if (!choices.contains(argRest))
             fail(s"$arg is not a valid choice for $name", args)
           else update(argRest, args)
+        case (StringTag, arg :: args) if name == "-d" =>
+          Path(arg) match {
+            case _: Directory =>
+              update(arg, args)
+            case p if p.extension == "jar" =>
+              update(arg, args)
+            case _ =>
+              fail(s"'$arg' does not exist or is not a directory", args)
+          }
         case (StringTag, arg2 :: args2) =>
           update(arg2, args2)
         case (IntTag, arg2 :: args2) =>
@@ -161,11 +169,6 @@ object Settings {
             case Success(v) => update(v, args)
             case Failure(ex) => fail(ex.getMessage, args)
           }
-        case (DirectoryJarTag, arg :: args) =>
-          val path = Path(arg)
-          if (path.isDirectory) update(path, args)
-          else if (path.extension == "jar") update(path, args)
-          else fail(s"'$arg' does not exist or is not a directory", args)
         case (_, Nil) =>
           missingArg
       }
@@ -275,6 +278,9 @@ object Settings {
     def PathSetting(name: String, descr: String, default: String): Setting[String] =
       publish(Setting(name, descr, default))
 
+    def PathSetting(name: String, helpArg: String, descr: String, default: String): Setting[String] =
+        publish(Setting(name, descr, default, helpArg))
+
     def PhasesSetting(name: String, descr: String, default: String = ""): Setting[List[String]] =
       publish(Setting(name, descr, if (default.isEmpty) Nil else List(default)))
 
@@ -286,8 +292,5 @@ object Settings {
 
     def OptionSetting[T: ClassTag](name: String, descr: String): Setting[Option[T]] =
       publish(Setting(name, descr, None, propertyClass = Some(implicitly[ClassTag[T]].runtimeClass)))
-
-    def DirectoryJarSetting(name: String, helpArg: String, descr: String, default: Directory): Setting[Path] =
-      publish(Setting(name, descr, default, helpArg))
   }
 }

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

@@ -15,10 +15,7 @@ class JarFS private (private[this] var jarFS: FileSystem) {
     new PlainDirectory(Directory(root))
   }
 
-  def close() = {
-    jarFS.close()
-    jarFS = null
-  }
+  def close() = jarFS.close()
 }
 
 object JarFS {

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -109,9 +109,9 @@ class ReplDriver(settings: Array[String],
       if (rootCtx.settings.outputDir.isDefault(rootCtx))
         new VirtualDirectory("(memory)", None)
       else {
-        val path = rootCtx.settings.outputDir.value(rootCtx)
+        val path = Directory(rootCtx.settings.outputDir.value(rootCtx))
         assert(path.isDirectory)
-        new PlainDirectory(path.toDirectory)
+        new PlainDirectory(path)
       }
     }
     compiler = new ReplCompiler(outDir)