Skip to content

Commit 604b937

Browse files
committed
More path fixes
1 parent 0ff65a5 commit 604b937

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ case class VirtualDirectoryClassPath(dir: VirtualDirectory) extends ClassPath wi
2424

2525
protected def emptyFiles: Array[AbstractFile] = Array.empty
2626
protected def getSubDir(packageDirName: String): Option[AbstractFile] =
27-
Option(lookupPath(dir)(packageDirName.split('/'), directory = true))
27+
Option(lookupPath(dir)(packageDirName.split(java.io.File.separator), directory = true))
2828
protected def listChildren(dir: AbstractFile, filter: Option[AbstractFile => Boolean] = None): Array[F] = filter match {
2929
case Some(f) => dir.iterator.filter(f).toArray
3030
case _ => dir.toArray
@@ -41,7 +41,7 @@ case class VirtualDirectoryClassPath(dir: VirtualDirectory) extends ClassPath wi
4141

4242
def findClassFile(className: String): Option[AbstractFile] = {
4343
val relativePath = FileUtils.dirPath(className) + ".class"
44-
Option(lookupPath(dir)(relativePath split '/', directory = false))
44+
Option(lookupPath(dir)(relativePath.split(java.io.File.separator), directory = false))
4545
}
4646

4747
private[dotty] def classes(inPackage: String): Seq[ClassFileEntry] = files(inPackage)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ trait ZipArchiveFileLookup[FileEntryType <: ClassRepresentation] extends ClassPa
6666
}
6767

6868
private def findDirEntry(pkg: String): Option[archive.DirEntry] = {
69-
val dirName = s"${FileUtils.dirPath(pkg)}/"
69+
val dirName = pkg.replace('.', '/')
7070
archive.allDirs.get(dirName)
7171
}
7272

0 commit comments

Comments
 (0)