refactor

Author: nicolasstucki

compiler/src/dotty/tools/dotc/classpath/ClassPath.scala

@@ -18,21 +18,6 @@ trait BinaryFileEntry extends ClassRepresentation {
   def file: AbstractFile
   def binary: Option[AbstractFile] = Some(file)
 }
-object BinaryFileEntry {
-  def apply(classFile: Option[AbstractFile], tasty: Option[AbstractFile]): BinaryFileEntry =
-    tasty match
-      case Some(tasty) => TastyFileEntry(tasty, classFile)
-      case None => ClassFileEntry(classFile.get)
-
-  def apply(file: AbstractFile): BinaryFileEntry =
-    if file.extension == "tasty" then TastyFileEntry(file, None)
-    else ClassFileEntry(file)
-
-  def from(classFile: Option[AbstractFile], tasty: Option[AbstractFile]): Option[BinaryFileEntry] =
-    tasty match
-      case Some(file) => Some(TastyFileEntry(file, classFile))
-      case None => classFile.map(ClassFileEntry(_))
-}
 
 trait SourceFileEntry extends ClassRepresentation {
   def file: AbstractFile

compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala

@@ -188,7 +188,7 @@ final class JrtClassPath(fs: java.nio.file.FileSystem) extends ClassPath with No
     else
       packageToModuleBases.getOrElse(inPackage.dottedString, Nil).flatMap(x =>
         Files.list(x.resolve(inPackage.dirPathTrailingSlash)).iterator().asScala.filter(_.getFileName.toString.endsWith(".class"))).map(x =>
-        BinaryFileEntry(x.toPlainFile)).toVector
+        ClassFileEntry(x.toPlainFile)).toVector
 
   override private[dotty] def list(inPackage: PackageName): ClassPathEntries =
     if (inPackage.isRoot) ClassPathEntries(packages(inPackage), Nil)
@@ -251,7 +251,7 @@ final class CtSymClassPath(ctSym: java.nio.file.Path, release: Int) extends Clas
     else {
       val sigFiles = packageIndex.getOrElse(inPackage.dottedString, Nil).iterator.flatMap(p =>
         Files.list(p).iterator.asScala.filter(_.getFileName.toString.endsWith(".sig")))
-      sigFiles.map(f => BinaryFileEntry(f.toPlainFile)).toVector
+      sigFiles.map(f => ClassFileEntry(f.toPlainFile)).toVector
     }
   }
 
@@ -275,7 +275,10 @@ final class CtSymClassPath(ctSym: java.nio.file.Path, release: Int) extends Clas
 
 case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[BinaryFileEntry] with NoSourcePaths {
   override def findClass(className: String): Option[ClassRepresentation] =
-    BinaryFileEntry.from(findClassFile(className), findTastyFile(className))
+    val classfile = findClassFile(className)
+    findTastyFile(className) match
+      case Some(file) => Some(TastyFileEntry(file, classfile))
+      case None => classfile.map(ClassFileEntry(_))
 
   def findClassFile(className: String): Option[AbstractFile] = {
     val relativePath = FileUtils.dirPath(className)
@@ -292,10 +295,8 @@ case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[BinaryFil
   }
 
   protected def createFileEntry(file: AbstractFile): BinaryFileEntry =
-    val (classFile, tastyFile) =
-      if file.isTasty then (Option(file.resolveSiblingWithExtension("class")), Some(file))
-      else (Some(file), None)
-    BinaryFileEntry(classFile, tastyFile)
+    if file.isTasty then TastyFileEntry(file, Option(file.resolveSiblingWithExtension("class")))
+    else ClassFileEntry(file)
 
   protected def isMatchingFile(f: JFile): Boolean =
     f.isTasty || (f.isClass && f.classToTasty.isEmpty)

compiler/src/dotty/tools/dotc/classpath/VirtualDirectoryClassPath.scala

@@ -42,10 +42,12 @@ case class VirtualDirectoryClassPath(dir: VirtualDirectory) extends ClassPath wi
     val pathSeq = FileUtils.dirPath(className).split(java.io.File.separator)
     val parentDir = lookupPath(dir)(pathSeq.init.toSeq, directory = true)
     if parentDir == null then return None
-    else BinaryFileEntry.from(
-      Option(lookupPath(parentDir)(pathSeq.last + ".class" :: Nil, directory = false)),
-      Option(lookupPath(parentDir)(pathSeq.last + ".tasty" :: Nil, directory = false))
-    )
+    else
+      val classfile = lookupPath(parentDir)(pathSeq.last + ".class" :: Nil, directory = false)
+      val tasty = lookupPath(parentDir)(pathSeq.last + ".tasty" :: Nil, directory = false)
+      if tasty != null then Some(TastyFileEntry(tasty, Option(classfile)))
+      else if classfile != null then Some(ClassFileEntry(classfile))
+      else None
 
   def findClassFile(className: String): Option[AbstractFile] = {
     val pathSeq = FileUtils.dirPath(className).split(java.io.File.separator)
@@ -57,10 +59,8 @@ case class VirtualDirectoryClassPath(dir: VirtualDirectory) extends ClassPath wi
   private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = files(inPackage)
 
   protected def createFileEntry(file: AbstractFile): BinaryFileEntry =
-    val (classFile, tastyFile) =
-      if file.isTasty then (Option(file.resolveSiblingWithExtension("class")), Some(file))
-      else (Some(file), None)
-    BinaryFileEntry(classFile, tastyFile)
+    if file.isTasty then TastyFileEntry(file, Option(file.resolveSiblingWithExtension("class")))
+    else ClassFileEntry(file)
 
   protected def isMatchingFile(f: AbstractFile): Boolean =
     f.isTasty || (f.isClass && f.classToTasty.isEmpty)

compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala

@@ -51,19 +51,17 @@ object ZipAndJarClassPathFactory extends ZipAndJarFileLookupFactory {
     override def findClass(className: String): Option[BinaryFileEntry] = {
       val (pkg, simpleClassName) = PackageNameUtils.separatePkgAndClassNames(className)
       val binaries = files(PackageName(pkg), simpleClassName + ".tasty", simpleClassName + ".class")
-      BinaryFileEntry.from(
-        binaries.find(_.classfile.isDefined).flatMap(_.classfile),
-        binaries.find(_.tasty.isDefined).flatMap(_.tasty),
-      )
+      val classfile = binaries.find(_.classfile.isDefined).flatMap(_.classfile)
+      binaries.find(_.tasty.isDefined).flatMap(_.tasty) match
+        case Some(file) => Some(TastyFileEntry(file, classfile))
+        case None => classfile.map(ClassFileEntry(_))
     }
 
     override private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = files(inPackage)
 
     override protected def createFileEntry(file: FileZipArchive#Entry): BinaryFileEntry =
-      val (classFile, tastyFile) =
-        if file.isTasty then (Option(file.resolveSiblingWithExtension("class")), Some(file))
-        else (Some(file), None)
-      BinaryFileEntry(classFile, tastyFile)
+      if file.isTasty then TastyFileEntry(file, Option(file.resolveSiblingWithExtension("class")))
+      else ClassFileEntry(file)
 
     override protected def isRequiredFileType(file: AbstractFile): Boolean =
       file.isTasty || (file.isClass && file.classToTasty.isEmpty)
@@ -139,7 +137,7 @@ object ZipAndJarClassPathFactory extends ZipAndJarFileLookupFactory {
     override private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = cachedPackages.get(inPackage.dottedString) match {
       case None => Seq.empty
       case Some(PackageFileInfo(pkg, _)) =>
-        (for (file <- pkg if file.isClass) yield BinaryFileEntry(file)).toSeq
+        (for (file <- pkg if file.isClass) yield ClassFileEntry(file)).toSeq
     }
 
     override private[dotty] def hasPackage(pkg: PackageName) = cachedPackages.contains(pkg.dottedString)