@@ -275,24 +275,16 @@ final class CtSymClassPath(ctSym: java.nio.file.Path, release: Int) extends Clas
275
275
276
276
case class DirectoryClassPath (dir : JFile ) extends JFileDirectoryLookup [BinaryFileEntry ] with NoSourcePaths {
277
277
override def findClass (className : String ): Option [ClassRepresentation ] =
278
- val classfile = findClassFile(className)
279
- findTastyFile(className) match
280
- case Some (file) =>
281
- Some (if classfile.isDefined then TastyFileEntry (file) else StandaloneTastyFileEntry (file))
282
- case None => classfile.map(ClassFileEntry (_))
278
+ findClassFile(className).map(BinaryFileEntry (_))
283
279
284
280
def findClassFile (className : String ): Option [AbstractFile ] = {
285
- val relativePath = FileUtils .dirPath(className)
286
- val classFile = new JFile (dir, relativePath + " .class" )
287
- if classFile.exists then Some (classFile.toPath.toPlainFile)
288
- else None
289
- }
290
-
291
- private def findTastyFile (className : String ): Option [AbstractFile ] = {
292
281
val relativePath = FileUtils .dirPath(className)
293
282
val tastyFile = new JFile (dir, relativePath + " .tasty" )
294
283
if tastyFile.exists then Some (tastyFile.toPath.toPlainFile)
295
- else None
284
+ else
285
+ val classFile = new JFile (dir, relativePath + " .class" )
286
+ if classFile.exists then Some (classFile.toPath.toPlainFile)
287
+ else None
296
288
}
297
289
298
290
protected def createFileEntry (file : AbstractFile ): BinaryFileEntry = BinaryFileEntry (file)
@@ -309,7 +301,7 @@ case class DirectorySourcePath(dir: JFile) extends JFileDirectoryLookup[SourceFi
309
301
protected def createFileEntry (file : AbstractFile ): SourceFileEntry = SourceFileEntry (file)
310
302
protected def isMatchingFile (f : JFile ): Boolean = endsScalaOrJava(f.getName)
311
303
312
- override def findClass (className : String ): Option [ClassRepresentation ] = findSourceFile(className) map SourceFileEntry .apply
304
+ override def findClass (className : String ): Option [ClassRepresentation ] = findSourceFile(className). map( SourceFileEntry (_))
313
305
314
306
private def findSourceFile (className : String ): Option [AbstractFile ] = {
315
307
val relativePath = FileUtils .dirPath(className)
0 commit comments