refactor

Author: nicolasstucki

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

@@ -46,7 +46,7 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
     val sourceEntry = findEntry(isSource = true)
 
     (classEntry, sourceEntry) match {
-      case (Some(c: BinaryFileEntry), Some(s: SourceFileEntry)) => Some(ClassAndSourceFilesEntry(c, s.file))
+      case (Some(c: BinaryFileEntry), Some(s: SourceFileEntry)) => Some(BinaryAndSourceFilesEntry(c, s))
       case (c @ Some(_), _) => c
       case (_, s) => s
     }
@@ -128,17 +128,17 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
         val existing = mergedEntries(index)
 
         if !existing.binary.isDefined && entry.binary.isDefined then
-          mergedEntries(index) = ClassAndSourceFilesEntry(entry, existing.source.get)
+          mergedEntries(index) = BinaryAndSourceFilesEntry(entry, existing)
         else if
           existing.classfile.isDefined && !existing.tasty.isDefined
           && !entry.classfile.isDefined && entry.tasty.isDefined
         then
           mergedEntries(index) = existing.source match
-            case Some(source) => ClassAndSourceFilesEntry(entry, source)
+            case Some(source) => BinaryAndSourceFilesEntry(entry, existing)
             case None => entry
 
         if (existing.source.isEmpty && entry.source.isDefined)
-          mergedEntries(index) = ClassAndSourceFilesEntry(existing, entry.source.get)
+          mergedEntries(index) = BinaryAndSourceFilesEntry(existing, entry)
       }
       else {
         indices(name) = count

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

@@ -19,10 +19,6 @@ trait BinaryFileEntry extends ClassRepresentation {
   def binary: Option[AbstractFile] = Some(file)
 }
 
-trait SourceFileEntry extends ClassRepresentation {
-  def file: AbstractFile
-}
-
 case class PackageName(dottedString: String) {
   val dirPathTrailingSlashJar: String = FileUtils.dirPathInJar(dottedString) + "/"
 
@@ -64,7 +60,7 @@ private[dotty] case class TastyFileEntry(file: AbstractFile, classfile: Option[A
   def source: Option[AbstractFile] = None
 }
 
-private[dotty] case class SourceFileEntryImpl(file: AbstractFile) extends SourceFileEntry {
+private[dotty] case class SourceFileEntry(file: AbstractFile) extends ClassRepresentation {
   final def fileName: String = file.name
   def name: String = FileUtils.stripSourceExtension(file.name)
   def binary: Option[AbstractFile] = None
@@ -73,17 +69,16 @@ private[dotty] case class SourceFileEntryImpl(file: AbstractFile) extends Source
   def source: Option[AbstractFile] = Some(file)
 }
 
-private[dotty] case class ClassAndSourceFilesEntry(classfile: Option[AbstractFile], tasty: Option[AbstractFile], srcFile: AbstractFile) extends ClassRepresentation {
-  assert(classfile.isDefined || tasty.isDefined)
-  assert(classfile.map(_.`extension` == "class").getOrElse(true), classfile)
-  assert(tasty.map(_.`extension` == "tasty").getOrElse(true), tasty)
-
-  private def classFile = tasty.getOrElse(classfile.get)
-
-  final def fileName: String = classFile.name
-  def name: String = FileUtils.stripClassExtension(classFile.name)
-  def binary: Option[AbstractFile] = tasty.orElse(classfile)
-  def source: Option[AbstractFile] = Some(srcFile)
+private[dotty] case class BinaryAndSourceFilesEntry(binaryEntry: ClassRepresentation, sourceEntry: ClassRepresentation) extends ClassRepresentation {
+  // TODO set these types in constructor
+  assert(binaryEntry.isInstanceOf[BinaryFileEntry])
+  assert(sourceEntry.isInstanceOf[SourceFileEntry])
+  final def fileName: String = binaryEntry.fileName
+  def name: String = binaryEntry.name
+  def binary: Option[AbstractFile] = binaryEntry.binary
+  def classfile: Option[AbstractFile] = binaryEntry.classfile
+  def tasty: Option[AbstractFile] = binaryEntry.tasty
+  def source: Option[AbstractFile] = sourceEntry.source
 }
 
 private[dotty] case class PackageEntryImpl(name: String) extends PackageEntry
@@ -97,7 +92,3 @@ private[dotty] trait NoClassPaths {
   def findClassFile(className: String): Option[AbstractFile] = None
   private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = Seq.empty
 }
-private[dotty] object ClassAndSourceFilesEntry {
-  def apply(binary: ClassRepresentation, source: AbstractFile): ClassRepresentation =
-    ClassAndSourceFilesEntry(binary.classfile, binary.tasty, source)
-}

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

@@ -304,13 +304,13 @@ case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[BinaryFil
   private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = files(inPackage)
 }
 
-case class DirectorySourcePath(dir: JFile) extends JFileDirectoryLookup[SourceFileEntryImpl] with NoClassPaths {
+case class DirectorySourcePath(dir: JFile) extends JFileDirectoryLookup[SourceFileEntry] with NoClassPaths {
   def asSourcePathString: String = asClassPathString
 
-  protected def createFileEntry(file: AbstractFile): SourceFileEntryImpl = SourceFileEntryImpl(file)
+  protected def createFileEntry(file: AbstractFile): SourceFileEntry = SourceFileEntry(file)
   protected def isMatchingFile(f: JFile): Boolean = endsScalaOrJava(f.getName)
 
-  override def findClass(className: String): Option[ClassRepresentation] = findSourceFile(className) map SourceFileEntryImpl.apply
+  override def findClass(className: String): Option[ClassRepresentation] = findSourceFile(className) map SourceFileEntry.apply
 
   private def findSourceFile(className: String): Option[AbstractFile] = {
     val relativePath = FileUtils.dirPath(className)

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

@@ -168,7 +168,7 @@ object ZipAndJarClassPathFactory extends ZipAndJarFileLookupFactory {
  */
 object ZipAndJarSourcePathFactory extends ZipAndJarFileLookupFactory {
   private case class ZipArchiveSourcePath(zipFile: File)
-    extends ZipArchiveFileLookup[SourceFileEntryImpl]
+    extends ZipArchiveFileLookup[SourceFileEntry]
     with NoClassPaths {
 
     def release: Option[String] = None
@@ -177,7 +177,7 @@ object ZipAndJarSourcePathFactory extends ZipAndJarFileLookupFactory {
 
     override private[dotty] def sources(inPackage: PackageName): Seq[SourceFileEntry] = files(inPackage)
 
-    override protected def createFileEntry(file: FileZipArchive#Entry): SourceFileEntryImpl = SourceFileEntryImpl(file)
+    override protected def createFileEntry(file: FileZipArchive#Entry): SourceFileEntry = SourceFileEntry(file)
     override protected def isRequiredFileType(file: AbstractFile): Boolean = file.isScalaOrJavaSource
   }