Skip to content

Commit 769233a

Browse files
committed
More fix for window path
1 parent a5e60dd commit 769233a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ final class JrtClassPath(fs: java.nio.file.FileSystem) extends ClassPath with No
174174
if (inPackage == "") Nil
175175
else {
176176
packageToModuleBases.getOrElse(inPackage, Nil).flatMap(x =>
177-
Files.list(x.resolve(inPackage.replace('.', '/'))).iterator().asScala.filter(_.getFileName.toString.endsWith(".class"))).map(x =>
177+
Files.list(x.resolve(FileUtils.dirPath(inPackage))).iterator().asScala.filter(_.getFileName.toString.endsWith(".class"))).map(x =>
178178
ClassFileEntryImpl(new PlainFile(new dotty.tools.io.File(x)))).toVector
179179
}
180180
}
@@ -193,7 +193,7 @@ final class JrtClassPath(fs: java.nio.file.FileSystem) extends ClassPath with No
193193
else {
194194
val inPackage = packageOf(className)
195195
packageToModuleBases.getOrElse(inPackage, Nil).iterator.flatMap{x =>
196-
val file = x.resolve(className.replace('.', '/') + ".class")
196+
val file = x.resolve(FileUtils.dirPath(className) + ".class")
197197
if (Files.exists(file)) new PlainFile(new dotty.tools.io.File(file)) :: Nil else Nil
198198
}.take(1).toList.headOption
199199
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object FileUtils {
4343
else throw new FatalError("Unexpected source file ending: " + fileName)
4444
}
4545

46-
def dirPath(forPackage: String): String = forPackage.replace('.', '/')
46+
def dirPath(forPackage: String): String = forPackage.replace('.', JFile.separatorChar)
4747

4848
def endsClass(fileName: String): Boolean =
4949
fileName.length > 6 && fileName.substring(fileName.length - 6) == ".class"

0 commit comments

Comments
 (0)