Merge pull request scalacenter#711 from adpi2/fix-metals-6382

adpi2 · web-flow · commit ebbc5ff91962 · 2024-05-08T14:42:38.000+02:00
[sbt plugin] check if `debugAdatperClassUpdates` is defined
diff --git a/modules/sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/internal/InternalTasks.scala b/modules/sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/internal/InternalTasks.scala
@@ -22,9 +22,9 @@ private[sbtplugin] object InternalTasks {
     val observables = for {
       (proj, configs) <- Keys.bspInternalDependencyConfigurations.value
       config <- configs
-    } yield (proj / config / debugAdapterClassUpdates)
+    } yield (proj / config / debugAdapterClassUpdates).?
     Def.setting {
-      observables.join.value.fold(Observable.empty[Seq[String]])(_ mergeWith _)
+      observables.join.value.flatten.fold(Observable.empty[Seq[String]])(_ mergeWith _)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ private[sbtplugin] object InternalTasks {`
`22`	`22`	`val observables = for {`
`23`	`23`	`(proj, configs) <- Keys.bspInternalDependencyConfigurations.value`
`24`	`24`	`config <- configs`
`25`		`- } yield (proj / config / debugAdapterClassUpdates)`
	`25`	`+ } yield (proj / config / debugAdapterClassUpdates).?`
`26`	`26`	`Def.setting {`
`27`		`- observables.join.value.fold(Observable.empty[Seq[String]])(_ mergeWith _)`
	`27`	`+ observables.join.value.flatten.fold(Observable.empty[Seq[String]])(_ mergeWith _)`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`