From 897e2552e4f860b83e37d097c382a89734da88ac Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 2 Aug 2023 10:25:27 +0200 Subject: [PATCH] Maintain order of internal deps --- .../main/scala/sbt/internal/server/BuildServerProtocol.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala index 50ce2e1b9..e54a0139b 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala @@ -43,6 +43,7 @@ import scala.util.control.NonFatal import scala.util.{ Failure, Success, Try } import scala.annotation.nowarn import sbt.testing.Framework +import scala.collection.immutable.ListSet object BuildServerProtocol { import sbt.internal.bsp.codec.JsonProtocol._ @@ -903,7 +904,8 @@ object BuildServerProtocol { allDependencies .groupBy(_._1) .mapValues { deps => - deps.flatMap { case (_, configs) => configs }.toSet + // We use a list set to maintain the order of configs + ListSet(deps.flatMap { case (_, configs) => configs }: _*) } .toSeq }