Skip to content

Commit a5e60dd

Browse files
committed
Fix window path in ClassPath
1 parent 1c721d8 commit a5e60dd

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,9 @@ case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[ClassFile
206206
override def findClass(className: String): Option[ClassRepresentation] = findClassFile(className) map ClassFileEntryImpl
207207

208208
def findClassFile(className: String): Option[AbstractFile] = {
209+
import JFile.{ separator => sep }
209210
val relativePath = FileUtils.dirPath(className)
210-
val classFile = new JFile(s"$dir/$relativePath.class")
211+
val classFile = new JFile(s"$dir$sep$relativePath.class")
211212
if (classFile.exists) {
212213
val wrappedClassFile = new dotty.tools.io.File(classFile.toPath)
213214
val abstractClassFile = new PlainFile(wrappedClassFile)
@@ -230,9 +231,10 @@ case class DirectorySourcePath(dir: JFile) extends JFileDirectoryLookup[SourceFi
230231
override def findClass(className: String): Option[ClassRepresentation] = findSourceFile(className) map SourceFileEntryImpl
231232

232233
private def findSourceFile(className: String): Option[AbstractFile] = {
234+
import JFile.{ separator => sep }
233235
val relativePath = FileUtils.dirPath(className)
234236
val sourceFile = Stream("scala", "java")
235-
.map(ext => new JFile(s"$dir/$relativePath.$ext"))
237+
.map(ext => new JFile(s"$dir$sep$relativePath.$ext"))
236238
.collectFirst { case file if file.exists() => file }
237239

238240
sourceFile.map { file =>

0 commit comments

Comments
 (0)