Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Take into consideration the compile order.

  • Loading branch information...
commit fb8feda7b32ece641960436db3694c7268eb7c25 1 parent bd03d89
@dragos dragos authored
View
10 ...la-ide.sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/AnalysisCompile.scala
@@ -41,9 +41,7 @@ import xsbti.Reporter
class AnalysisCompile (conf: BasicConfiguration, bm: EclipseSbtBuildManager, contr: Controller) extends HasLogger {
private lazy val store = bm.analysisStore
- private def withBootclasspath(args: CompilerArguments, classpath: Seq[File]): Seq[File] =
- args.bootClasspath ++ args.finishClasspath(classpath)
- implicit def toAbstractFile(files: Seq[File]): Set[AbstractFile] =
+ def toAbstractFile(files: Seq[File]): Set[AbstractFile] =
files.flatMap(f => EclipseResource.fromString(f.getPath)).toSet
def removeSbtOutputDirs(args: List[String]) = {
@@ -64,9 +62,9 @@ class AnalysisCompile (conf: BasicConfiguration, bm: EclipseSbtBuildManager, con
sources: Seq[File], reporter: Reporter, settings: Settings,
compOrder: CompileOrder.Value, compOptions: Seq[String] = Nil,
javaSrcBases: Seq[File] = Nil, javacOptions: Seq[String] = Nil,
- analysisMap: Map[File, Analysis] = Map.empty, maxErrors: Int = 100)(implicit log: EclipseLogger): Analysis = {
+ analysisMap: Map[File, Analysis] = Map.empty, maxErrors: Int = 100)(log: FlushableLogger): Analysis = {
val currentSetup = new CompileSetup(conf.outputDirectory, new CompileOptions(compOptions, javacOptions),
- scalac.scalaInstance.actualVersion, Mixed)
+ scalac.scalaInstance.actualVersion, compOrder)
import currentSetup._
val getAnalysis = analysisMap.get _
@@ -204,10 +202,8 @@ class AnalysisCompile (conf: BasicConfiguration, bm: EclipseSbtBuildManager, con
private def extract(previous: Option[(Analysis, CompileSetup)]): (Analysis, Option[CompileSetup]) =
previous match {
case Some((an, setup)) =>
-// logger.debug("restore previous setup")
(an, Some(setup))
case None =>
-// logger.debug("previous step")
(Analysis.Empty, None)
}
def javaOnly(f: File) = f.getName.endsWith(".java")

0 comments on commit fb8feda

Please sign in to comment.
Something went wrong with that request. Please try again.