Merge branch 'main' into scala-3.3.2

Author: adpi2

build.sbt

@@ -164,7 +164,7 @@ lazy val expressionCompiler = projectMatrix
         case (3, 0) => Seq("3.0.2", "3.0.1", "3.0.0")
         case (3, 1 | 2 | 3) =>
           Seq("3.3.2", "3.3.1", "3.3.0", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0")
-        case (3, _) => Seq("3.4.0-RC4")
+        case (3, _) => Seq("3.4.0")
       }
       .toSeq
       .flatten,

modules/core/src/main/scala/ch/epfl/scala/debugadapter/Debuggee.scala

@@ -12,7 +12,7 @@ trait Debuggee {
   def libraries: Seq[Library]
   def unmanagedEntries: Seq[UnmanagedEntry]
   def javaRuntime: Option[JavaRuntime]
-  def observeClassesToUpdate(updateClasses: Seq[String] => Unit): Closeable
+  def observeClassUpdates(onClassUpdate: Seq[String] => Unit): Closeable
 
   def managedEntries: Seq[ManagedEntry] = modules ++ libraries
   def classPathEntries: Seq[ClassPathEntry] = managedEntries ++ unmanagedEntries

modules/core/src/main/scala/ch/epfl/scala/debugadapter/internal/HotCodeReplaceProvider.scala

@@ -45,7 +45,7 @@ class HotCodeReplaceProvider(
   override def initialize(context: IDebugAdapterContext, options: ju.Map[String, Object]): Unit = {
     this.context = context
     this.currentDebugSession = context.getDebugSession
-    this.subscription = debuggee.observeClassesToUpdate(classes => classesAccumulator.updateAndGet(_ ++ classes))
+    this.subscription = debuggee.observeClassUpdates(classes => classesAccumulator.updateAndGet(_ ++ classes))
     this.sourceLookUp = context.getProvider(classOf[ISourceLookUpProvider]).asInstanceOf[SourceLookUpProvider]
     this.stackTraceProvider = context.getProvider(classOf[IStackTraceProvider]).asInstanceOf[StackTraceProvider]
   }

modules/sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/DebugAdapterPlugin.scala

@@ -64,9 +64,8 @@ object DebugAdapterPlugin extends sbt.AutoPlugin {
       inputKey[URI]("Start a debug session for running test suites").withRank(KeyRanks.DTask)
     val startRemoteDebugSession =
       inputKey[URI]("Start a debug session on a remote process").withRank(KeyRanks.DTask)
-    val debugAdapterConfig =
-      settingKey[DebugConfig]("Configure the debug session").withRank(KeyRanks.DTask)
-    val debugAdapterClassesToUpdate =
+    val debugAdapterConfig = settingKey[DebugConfig]("Configure the debug session").withRank(KeyRanks.DTask)
+    val debugAdapterClassUpdates =
       settingKey[PublishSubject[Seq[String]]]("Observe the classes to be reloaded by the debuggee")
         .withRank(KeyRanks.DTask)
     val stopDebugSession =
@@ -108,7 +107,7 @@ object DebugAdapterPlugin extends sbt.AutoPlugin {
     startMainClassDebugSession := mainClassSessionTask.evaluated,
     startRemoteDebugSession := remoteSessionTask.evaluated,
     stopDebugSession := stopSessionTask.value,
-    debugAdapterClassesToUpdate := PublishSubject.create(),
+    debugAdapterClassUpdates := PublishSubject.create(),
     Keys.compile / Keys.javacOptions := {
       val jo = (Keys.compile / Keys.javacOptions).value
       if (jo.exists(_.startsWith("-g"))) jo
@@ -117,10 +116,10 @@ object DebugAdapterPlugin extends sbt.AutoPlugin {
     Keys.compile := {
       val currentAnalysis: CompileAnalysis = Keys.compile.value
       val previousAnalysis = Keys.previousCompile.value.analysis
-      val classesToUpdate = debugAdapterClassesToUpdate.value
+      val classesToUpdate = debugAdapterClassUpdates.value
       val fileConverter = Keys.fileConverter.value
       val classDir = Keys.classDirectory.value.toPath
-      if (previousAnalysis.isPresent) {
+      if (previousAnalysis.isPresent && classesToUpdate.hasObservers) {
         val currentStamps = currentAnalysis.readStamps
         val previousStamps = previousAnalysis.get.readStamps
         val newClasses = getNewClasses(currentStamps, previousStamps, fileConverter, classDir)
@@ -283,7 +282,7 @@ object DebugAdapterPlugin extends sbt.AutoPlugin {
             InternalTasks.libraries.value,
             InternalTasks.unmanagedEntries.value,
             InternalTasks.javaRuntime.value,
-            InternalTasks.classesToUpdate.value,
+            InternalTasks.allClassUpdates.value,
             mainClass.`class`,
             mainClass.arguments,
             new LoggerAdapter(logger)
@@ -389,7 +388,7 @@ object DebugAdapterPlugin extends sbt.AutoPlugin {
             InternalTasks.libraries.value,
             InternalTasks.unmanagedEntries.value,
             InternalTasks.javaRuntime.value,
-            InternalTasks.classesToUpdate.value,
+            InternalTasks.allClassUpdates.value,
             cleanups,
             parallel,
             testRunners,
@@ -455,7 +454,7 @@ object DebugAdapterPlugin extends sbt.AutoPlugin {
           InternalTasks.libraries.value,
           InternalTasks.unmanagedEntries.value,
           InternalTasks.javaRuntime.value,
-          InternalTasks.classesToUpdate.value,
+          InternalTasks.allClassUpdates.value,
           new LoggerAdapter(logger)
         )
       startServer(jobService, scope, state, target, debuggee, debugToolsResolver, debugAdapterConfig.value)

modules/sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/internal/InternalTasks.scala

@@ -17,12 +17,12 @@ private[sbtplugin] object InternalTasks {
     modules.join(_.join)
   }
 
-  lazy val classesToUpdate: Def.Initialize[Observable[Seq[String]]] = Def.settingDyn {
+  lazy val allClassUpdates: Def.Initialize[Observable[Seq[String]]] = Def.settingDyn {
     val internalDependencies = Keys.bspInternalDependencyConfigurations
     val observables = for {
       (proj, configs) <- Keys.bspInternalDependencyConfigurations.value
       config <- configs
-    } yield (proj / config / debugAdapterClassesToUpdate)
+    } yield (proj / config / debugAdapterClassUpdates)
     Def.setting {
       observables.join.value.fold(Observable.empty[Seq[String]])(_ mergeWith _)
     }

modules/sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/internal/SbtDebuggee.scala

@@ -20,8 +20,8 @@ private[debugadapter] sealed trait SbtDebuggee extends Debuggee {
   val logger: LoggerAdapter
   val classesToUpdate: Observable[Seq[String]]
 
-  override def observeClassesToUpdate(updateClasses: Seq[String] => Unit): Closeable = {
-    val subscription = classesToUpdate.subscribe(updateClasses(_))
+  override def observeClassUpdates(onClassUpdate: Seq[String] => Unit): Closeable = {
+    val subscription = classesToUpdate.subscribe(onClassUpdate(_))
     () => if (!subscription.isDisposed) subscription.dispose
   }
 }

modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/MockDebuggee.scala

@@ -34,7 +34,7 @@ class MockDebuggee extends Debuggee {
 
   override def javaRuntime: Option[JavaRuntime] = None
 
-  override def observeClassesToUpdate(updateClasses: Seq[String] => Unit): Closeable = () => ()
+  override def observeClassUpdates(onClassUpdate: Seq[String] => Unit): Closeable = () => ()
 }
 
 class MockCancelableFuture() extends CancelableFuture[Unit] {

modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/TestingDebuggee.scala

@@ -43,8 +43,8 @@ case class TestingDebuggee(
     with TestingContext {
 
   val classesToUpdate: Subject[Seq[String]] = PublishSubject.create()
-  override def observeClassesToUpdate(updateClasses: Seq[String] => Unit): Closeable = {
-    val subscription = classesToUpdate.subscribe(updateClasses(_))
+  override def observeClassUpdates(onClassUpdate: Seq[String] => Unit): Closeable = {
+    val subscription = classesToUpdate.subscribe(onClassUpdate(_))
     () => if (!subscription.isDisposed) subscription.dispose
   }
   def mainSource: Path = sourceFiles.head

project/Dependencies.scala

@@ -6,7 +6,7 @@ object Dependencies {
   val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.12")
   val scala30 = scalaEnvVersion.filter(isScala30).getOrElse("3.0.2")
   val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.2")
-  val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0-RC4")
+  val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0")
   val asmVersion = "9.6"
   val coursierVersion = "2.1.9"