diff --git a/compiler/test/dotty/tools/DottyTest.scala b/compiler/test/dotty/tools/DottyTest.scala index 229891806a76..7ccbc09a4c92 100644 --- a/compiler/test/dotty/tools/DottyTest.scala +++ b/compiler/test/dotty/tools/DottyTest.scala @@ -44,7 +44,7 @@ trait DottyTest extends ContextEscapeDetection { fc.setProperty(ContextDoc, new ContextDocstrings) } - protected def defaultCompiler: Compiler = Compiler() + protected def defaultCompiler: Compiler = new Compiler() private def compilerWithChecker(phase: String)(assertion: (tpd.Tree, Context) => Unit) = new Compiler { diff --git a/compiler/test/dotty/tools/dotc/sbt/ProgressCallbackTest.scala b/compiler/test/dotty/tools/dotc/sbt/ProgressCallbackTest.scala index c2ab4c41318c..82cee9928271 100644 --- a/compiler/test/dotty/tools/dotc/sbt/ProgressCallbackTest.scala +++ b/compiler/test/dotty/tools/dotc/sbt/ProgressCallbackTest.scala @@ -145,10 +145,10 @@ object ProgressCallbackTest: case class ProgressEvent(curr: Int, total: Int, currPhase: String, nextPhase: String) case class PhaseTransition(curr: String, next: String) - def asSubphases(phase: Phase): IArray[String] = - val subPhases = Run.SubPhases(phase).all - if subPhases.isEmpty then IArray(phase.phaseName) - else subPhases + def asSubphases(phase: Phase): IndexedSeq[String] = + val subPhases = Run.SubPhases(phase) + val indices = 0 until phase.traversals + indices.map(subPhases.subPhase) def runnablePhases()(using Context): IArray[Phase] = IArray.from(ctx.base.allPhases.filter(_.isRunnable)) diff --git a/sbt-bridge/test/xsbt/CompileProgressSpecification.scala b/sbt-bridge/test/xsbt/CompileProgressSpecification.scala index 32b4f58effdb..45f9daa70e05 100644 --- a/sbt-bridge/test/xsbt/CompileProgressSpecification.scala +++ b/sbt-bridge/test/xsbt/CompileProgressSpecification.scala @@ -54,7 +54,6 @@ class CompileProgressSpecification { "parser", "typer (indexing)", "typer (typechecking)", "typer (checking java)", "sbt-deps", - "extractSemanticDB", "posttyper", "sbt-api", "SetRootTree",