Fix fancy uses of analysis

Port of sbt/sbt@dc04892
needed because sbt 1.4 uses batch mode for scripted tests.

Author: smarter

sbt-dotty/sbt-test/source-dependencies/trait-member-modified/build.sbt

@@ -1,24 +1,46 @@
+import xsbti.VirtualFileRef
+import sbt.internal.inc.Analysis
+import xsbti.compile.{PreviousResult, CompileAnalysis, MiniSetup}
+import xsbti.compile.analysis.{ Compilation => XCompilation }
+
+previousCompile in Compile := {
+  val previous = (previousCompile in Compile).value
+  if (!CompileState.isNew) {
+    val res = PreviousResult.of(none[CompileAnalysis].asJava, none[MiniSetup].asJava)
+    CompileState.isNew = true
+    res
+  } else previous
+}
+
 /* Performs checks related to compilations:
  *  a) checks in which compilation given set of files was recompiled
  *  b) checks overall number of compilations performed
  */
-TaskKey[Unit]("check-compilations") := {
-  val analysis = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis]
+TaskKey[Unit]("checkCompilations") := {
+  val analysis = (compile in Compile).value match { case a: Analysis => a }
+  val srcDir = (scalaSource in Compile).value
+  def findFile(className: String): VirtualFileRef = {
+    analysis.relations.definesClass(className).head
+  }
   val allCompilations = analysis.compilations.allCompilations
-  val recompiledClasses: Seq[Set[String]] = allCompilations map { c =>
-    val recompiledClasses = analysis.apis.internal.collect {
-      case (clazz, api) if api.compilationTimestamp() == c.getStartTime() => clazz
+  val recompiledFiles: Seq[Set[VirtualFileRef]] = allCompilations map { c: XCompilation =>
+    val recompiledFiles = analysis.apis.internal.collect {
+      case (cn, api) if api.compilationTimestamp == c.getStartTime => findFile(cn)
     }
-    recompiledClasses.toSet
+    recompiledFiles.toSet
   }
-  def recompiledFilesInIteration(iteration: Int, classNames: Set[String]): Unit = {
-    assert(recompiledClasses(iteration) == classNames, "%s != %s".format(recompiledClasses(iteration), classNames))
+  def recompiledFilesInIteration(iteration: Int, fileNames: Set[String]) = {
+    assert(recompiledFiles(iteration).map(_.name) == fileNames,
+      s"""${recompiledFiles(iteration).map(_.name)} != $fileNames
+         |
+         |allCompilations = $allCompilations
+         |""".stripMargin)
   }
-  assert(allCompilations.size == 2)
+  assert(allCompilations.size == 2, s"All compilations is ${allCompilations.size}")
   // B.scala is just compiled at the beginning
-  recompiledFilesInIteration(0, Set("B"))
+  recompiledFilesInIteration(0, Set("B.scala"))
   // A.scala is changed and recompiled
-  recompiledFilesInIteration(1, Set("A"))
+  recompiledFilesInIteration(1, Set("A.scala"))
 }
 
 logLevel := Level.Debug

sbt-dotty/sbt-test/source-dependencies/trait-member-modified/project/CompileState.scala

@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var isNew: Boolean = false
+}

sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/build.sbt

@@ -1,36 +1,69 @@
+import sbt.internal.inc.Analysis
+import xsbti.VirtualFileRef
+import xsbti.api.AnalyzedClass
+import xsbti.compile.{PreviousResult, CompileAnalysis, MiniSetup}
+import xsbti.compile.analysis.{ Compilation => XCompilation }
+
 logLevel := Level.Debug
 
+// Reset compile status because scripted tests are run in batch mode
+previousCompile in Compile := {
+  val previous = (previousCompile in Compile).value
+  if (!CompileState.isNew) {
+    val res = PreviousResult.of(none[CompileAnalysis].asJava, none[MiniSetup].asJava)
+    CompileState.isNew = true
+    res
+  } else previous
+}
+
 // disable sbt's heuristic which recompiles everything in case
 // some fraction (e.g. 50%) of files is scheduled to be recompiled
 // in this test we want precise information about recompiled files
 // which that heuristic would distort
 incOptions := incOptions.value.withRecompileAllFraction(1.0)
 
+Global / allowMachinePath := false
+
 /* Performs checks related to compilations:
  *  a) checks in which compilation given set of files was recompiled
  *  b) checks overall number of compilations performed
  */
-TaskKey[Unit]("check-compilations") := {
-  val analysis = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis]
+TaskKey[Unit]("checkCompilations") := {
+  val log = streams.value.log
+  val c = fileConverter.value
+  val vs = (Compile / sources).value.toVector map { x =>
+    c.toVirtualFile(x.toPath)
+  }
+  // log.info(vs.mkString(","))
+
+  val analysis = (compile in Compile).value match { case a: Analysis => a }
   val srcDir = (scalaSource in Compile).value
-  val allCompilations = analysis.compilations.allCompilations
-  val recompiledClasses: Seq[Set[String]] = allCompilations map { c =>
-    val recompiledClasses = analysis.apis.internal.collect {
-      case (clazz, api) if api.compilationTimestamp() == c.getStartTime() => clazz
+  def findFile(className: String): VirtualFileRef = {
+    analysis.relations.definesClass(className).head
+  }
+  val allCompilations: Seq[XCompilation] = analysis.compilations.allCompilations
+  log.info(s"allCompilations: $allCompilations")
+  val recompiledFiles: Seq[Set[VirtualFileRef]] = allCompilations map { c: XCompilation =>
+    val recompiledFiles = analysis.apis.internal.collect {
+      case (cn, api) if api.compilationTimestamp == c.getStartTime => findFile(cn)
     }
-    recompiledClasses.toSet
+    recompiledFiles.toSet
   }
-  def recompiledClassesInIteration(iteration: Int, classNames: Set[String]): Unit = {
-    assert(recompiledClasses(iteration) == classNames, "%s != %s".format(recompiledClasses(iteration), classNames))
+  def recompiledFilesInIteration(iteration: Int, fileNames: Set[String]) = {
+    assert(recompiledFiles(iteration).map(_.name) == fileNames,
+      s"""${recompiledFiles(iteration).map(_.name)} != $fileNames
+         |
+         |allCompilations = $allCompilations
+         |""".stripMargin)
   }
-  // test.Y is compiled only at the beginning as changes to test.A do not affect it
-  recompiledClassesInIteration(0, Set("test.X", "test.Y"))
-  // test.A is changed and recompiled
-  recompiledClassesInIteration(1, Set("test.A"))
-  // change in test.A causes recompilation of test.B, test.C, test.D which depend on transitively
-  // and by inheritance on test.A
-  // test.X is also recompiled because it depends by member reference on test.B
-  // Note that test.Y is not recompiled because it depends just on X through member reference dependency
-  recompiledClassesInIteration(2, Set("test.B", "test.C", "test.D"))
+  // Y.scala is compiled only at the beginning as changes to A.scala do not affect it
+  recompiledFilesInIteration(0, Set("X.scala", "Y.scala"))
+  // A.scala is changed and recompiled
+  recompiledFilesInIteration(1, Set("A.scala"))
+  // change in A.scala causes recompilation of B.scala, C.scala, D.scala which depend on transitively
+  // and by inheritance on A.scala
+  // X.scala is also recompiled because it depends by member reference on B.scala
+  // Note that Y.scala is not recompiled because it depends just on X through member reference dependency
+  recompiledFilesInIteration(2, Set("B.scala", "C.scala", "D.scala"))
   assert(allCompilations.size == 3)
 }

sbt-dotty/sbt-test/source-dependencies/transitive-memberRef/project/CompileState.scala

@@ -0,0 +1,4 @@
+// This is necessary because tests are run in batch mode
+object CompileState {
+  @volatile var isNew: Boolean = false
+}