Skip to content

Commit 7727d51

Browse files
committed
Refactor without using JFile.separator (thanks @michelou)
1 parent 769233a commit 7727d51

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,8 @@ 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 }
210209
val relativePath = FileUtils.dirPath(className)
211-
val classFile = new JFile(s"$dir$sep$relativePath.class")
210+
val classFile = new JFile(dir, relativePath + ".class")
212211
if (classFile.exists) {
213212
val wrappedClassFile = new dotty.tools.io.File(classFile.toPath)
214213
val abstractClassFile = new PlainFile(wrappedClassFile)
@@ -231,10 +230,9 @@ case class DirectorySourcePath(dir: JFile) extends JFileDirectoryLookup[SourceFi
231230
override def findClass(className: String): Option[ClassRepresentation] = findSourceFile(className) map SourceFileEntryImpl
232231

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

240238
sourceFile.map { file =>

0 commit comments

Comments
 (0)