Optimize finding output dir for source

sbt · Nov 29, 2018 · 20c3a04 · 20c3a04
1 parent 8e3ff4d
commit 20c3a04
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/internal/compiler-bridge/src/main/scala/xsbt/Analyzer.scala b/internal/compiler-bridge/src/main/scala/xsbt/Analyzer.scala
@@ -45,15 +45,15 @@ final class Analyzer(val global: CallbackGlobal) extends LocateClassFile {
 
     def apply(unit: CompilationUnit): Unit = {
       if (!unit.isJava) {
-        val sourceFile = unit.source.file.file
+        val sourceFile = unit.source.file
+        lazy val outputDir = settings.outputDirs.outputDirFor(sourceFile).file
         for (iclass <- unit.icode) {
           val sym = iclass.symbol
-          lazy val outputDir = settings.outputDirs.outputDirFor(sym.sourceFile).file
           def addGenerated(separatorRequired: Boolean): Unit = {
             val locatedClass = {
               JarUtils.outputJar match {
                 case Some(outputJar) => locateClassInJar(sym, outputJar, separatorRequired)
-                case None            => locatePlainClassFile(sym, separatorRequired)
+                case None            => locatePlainClassFile(sym, outputDir, separatorRequired)
               }
             }
 
@@ -62,7 +62,7 @@ final class Analyzer(val global: CallbackGlobal) extends LocateClassFile {
               // Use own map of local classes computed before lambdalift to ascertain class locality
               if (localToNonLocalClass.isLocal(sym).getOrElse(true)) {
                 // Inform callback about local classes, non-local classes have been reported in API
-                callback.generatedLocalClass(sourceFile, classFile)
+                callback.generatedLocalClass(sourceFile.file, classFile)
               }
             }
           }
@@ -77,8 +77,7 @@ final class Analyzer(val global: CallbackGlobal) extends LocateClassFile {
       }
     }
 
-    private def locatePlainClassFile(sym: Symbol, separatorRequired: Boolean): Option[File] = {
-      val outputDir = settings.outputDirs.outputDirFor(sym.sourceFile).file
+    private def locatePlainClassFile(sym: Symbol, outputDir: File, separatorRequired: Boolean): Option[File] = {
       val classFile = fileForClass(outputDir, sym, separatorRequired)
       if (classFile.exists()) Some(classFile) else None
     }