Merge pull request #1513 from olafurpg/multipath

Remove scala.meta.io.{Multipath,Sourcepath,Fragment}

scalameta/io/shared/src/main/scala/scala/meta/internal/io/package.scala

@@ -0,0 +1,33 @@
+package scala.meta.internal
+
+import java.nio.file.FileVisitor
+import java.nio.file.Files
+import java.nio.file.Path
+import scala.meta.io.AbsolutePath
+import scala.meta.io.Classpath
+
+package object io {
+
+  implicit class XtensionClasspath(cp: Classpath) {
+    def visit(getVisitor: AbsolutePath => FileVisitor[Path]): Unit = {
+      cp.entries.foreach { base =>
+        if (base.isDirectory) {
+          val visitor = getVisitor(base)
+          Files.walkFileTree(base.toNIO, visitor)
+        } else if (base.isFile) {
+          PathIO.extension(base.toNIO) match {
+            case "jar" =>
+              val root = FileIO.jarRootPath(base)
+              val visitor = getVisitor(root)
+              Files.walkFileTree(root.toNIO, visitor)
+            case _ =>
+              sys.error(s"Expected jar file, obtained $base")
+          }
+        } else {
+          ()
+        }
+      }
+    }
+  }
+
+}

scalameta/io/shared/src/main/scala/scala/meta/io/Api.scala

@@ -10,15 +10,6 @@ private[meta] trait Aliases {
   type RelativePath = scala.meta.io.RelativePath
   lazy val RelativePath = scala.meta.io.RelativePath
 
-  type Multipath = scala.meta.io.Multipath
-  // there's no term Multipath, so we don't have a term alias here
-
-  type Fragment = scala.meta.io.Fragment
-  val Fragment = scala.meta.io.Fragment
-
   type Classpath = scala.meta.io.Classpath
   lazy val Classpath = scala.meta.io.Classpath
-
-  type Sourcepath = scala.meta.io.Sourcepath
-  lazy val Sourcepath = scala.meta.io.Sourcepath
 }

scalameta/io/shared/src/main/scala/scala/meta/io/Classpath.scala

@@ -0,0 +1,23 @@
+package scala.meta.io
+
+import java.io.File.pathSeparator
+
+final case class Classpath(entries: List[AbsolutePath]) {
+
+  @deprecated("Use .entries instead", "4.0.0")
+  def shallow: List[AbsolutePath] = entries
+
+  def syntax: String = entries.mkString(pathSeparator)
+  def structure: String = s"""Classpath("$syntax")"""
+  override def toString: String = syntax
+}
+
+object Classpath {
+  def apply(entry: AbsolutePath): Classpath = {
+    new Classpath(List(entry))
+  }
+
+  def apply(value: String): Classpath = {
+    new Classpath(value.split(pathSeparator).map(AbsolutePath(_)).toList)
+  }
+}

semanticdb/metacp/src/main/scala/scala/meta/cli/Metacp.scala

@@ -25,7 +25,7 @@ object Metacp {
       case Some(settings) =>
         process(settings, reporter) match {
           case Some(mclasspath) =>
-            reporter.out.println(mclasspath.shallow.mkString(File.pathSeparator))
+            reporter.out.println(mclasspath.entries.mkString(File.pathSeparator))
             0
           case None =>
             1

semanticdb/metacp/src/main/scala/scala/meta/internal/metacp/Main.scala

@@ -19,8 +19,8 @@ class Main(settings: Settings, reporter: Reporter) {
     val success = new AtomicBoolean(true)
 
     val classpath: GenSeq[AbsolutePath] =
-      if (settings.par) settings.classpath.shallow.par
-      else settings.classpath.shallow
+      if (settings.par) settings.classpath.entries.par
+      else settings.classpath.entries
 
     val buffer = new ConcurrentLinkedQueue[AbsolutePath]()
 

tests/jvm/src/test/scala/scala/meta/tests/api/SurfaceSuite.scala

@@ -81,10 +81,7 @@ class SurfaceSuite extends FunSuite {
       |scala.meta.io
       |scala.meta.io.AbsolutePath
       |scala.meta.io.Classpath
-      |scala.meta.io.Fragment
-      |scala.meta.io.Multipath
       |scala.meta.io.RelativePath
-      |scala.meta.io.Sourcepath
       |scala.meta.metac
       |scala.meta.metac.Reporter *
       |scala.meta.metac.Settings *

tests/jvm/src/test/scala/scala/meta/tests/io/MultipathSuite.scala

@@ -2,7 +2,6 @@ package scala.meta.tests
 package io
 
 import java.io.File
-import java.net.URI
 import org.scalatest.FunSuite
 import scala.meta._
 
@@ -14,31 +13,6 @@ class MultipathSuite extends FunSuite {
   files.foreach(file => {
     assert(new File(tmp, file).createNewFile())
   })
-  val multipath = Sourcepath(tmp.getAbsolutePath)
-
-  test("Multipath.deep") {
-    val obtained = multipath.deep.map(_.syntax)
-    val expected = files.map(file => Fragment(AbsolutePath(tmp), RelativePath(file))).map(_.syntax)
-    assert(obtained.sorted == expected.sorted)
-  }
-
-  test("Multipath.find") {
-    assert(multipath.find(RelativePath("a")).nonEmpty)
-  }
-
-  test("Multipath.relativize") {
-    assert(multipath.relativize(new URI("blah")).isEmpty)
-    files.foreach { file =>
-      assert(multipath.relativize(new File(tmp, file).toURI).get.toString == file)
-    }
-  }
-
-  test("Sourcepath.syntax") {
-    val fromPath = Sourcepath(List(AbsolutePath(tmp)))
-    val fromSyntax = Sourcepath(tmp.getAbsolutePath)
-    assert(fromPath == fromSyntax)
-    assert(fromPath.syntax == fromSyntax.syntax)
-  }
 
   test("Classpath.syntax") {
     val fromPath = Classpath(List(AbsolutePath(tmp)))

tests/jvm/src/test/scala/scala/meta/tests/metacp/SignatureSuite.scala

@@ -7,12 +7,11 @@ import java.nio.file.Path
 import java.nio.file.attribute.BasicFileAttributes
 import scala.collection.JavaConverters._
 import scala.collection.mutable.ArrayBuffer
-import scala.meta.internal.io.PathIO
+import scala.meta.internal.io._
 import scala.meta.internal.javacp._
 import scala.meta.internal.javacp.asm._
 import scala.meta.internal.metacp._
 import scala.meta.io.AbsolutePath
-import scala.meta.io.Classpath
 import scala.tools.asm.tree.ClassNode
 import scala.tools.asm.tree.FieldNode
 import scala.tools.asm.tree.MethodNode

tests/shared/src/test/scala/scala/meta/tests/prettyprinters/PublicSuite.scala

@@ -220,22 +220,10 @@ class PublicSuite extends FunSuite {
     // TODO: come up with a platform-independent test
   }
 
-  test("scala.meta.io.Fragment.toString") {
-    // TODO: come up with a platform-independent test
-  }
-
-  test("scala.meta.io.Multipath.toString") {
-    // TODO: come up with a platform-independent test
-  }
-
   test("scala.meta.io.RelativePath.toString") {
     // TODO: come up with a platform-independent test
   }
 
-  test("scala.meta.io.Sourcepath.toString") {
-    // TODO: come up with a platform-independent test
-  }
-
   test("scala.meta.metac.Settings.toString") {
     // n/a
   }