From df0bbcaec2d16d3cec295cbc025296535a6e3b0f Mon Sep 17 00:00:00 2001 From: Katarzyna Marek Date: Fri, 7 Apr 2023 09:25:03 +0200 Subject: [PATCH] post merge fix --- .../scala/scala/meta/internal/metals/WorkspaceFolders.scala | 4 ---- .../scala/meta/internal/metals/logging/MetalsLogger.scala | 6 ++++++ tests/slow/src/test/scala/tests/sbt/SbtServerSuite.scala | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/metals/src/main/scala/scala/meta/internal/metals/WorkspaceFolders.scala b/metals/src/main/scala/scala/meta/internal/metals/WorkspaceFolders.scala index 90b1eaa4915..73230c77d19 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/WorkspaceFolders.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/WorkspaceFolders.scala @@ -60,8 +60,4 @@ class WorkspaceFolders( } } - // private def createServices(folders: List[Folder]): List[MetalsLspService] = - // folders - // .map(createService) - } diff --git a/metals/src/main/scala/scala/meta/internal/metals/logging/MetalsLogger.scala b/metals/src/main/scala/scala/meta/internal/metals/logging/MetalsLogger.scala index 3186d491ae5..7af88064d41 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/logging/MetalsLogger.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/logging/MetalsLogger.scala @@ -136,5 +136,11 @@ object MetalsLogger { class MutipleOutputsStream(outputs: List[OutputStream]) extends OutputStream { override def write(b: Int): Unit = outputs.foreach(_.write(b)) + + override def write(b: Array[Byte], off: Int, len: Int): Unit = + outputs.foreach(_.write(b, off, len)) + override def flush(): Unit = outputs.foreach(_.flush()) + + override def close(): Unit = outputs.foreach(_.close()) } diff --git a/tests/slow/src/test/scala/tests/sbt/SbtServerSuite.scala b/tests/slow/src/test/scala/tests/sbt/SbtServerSuite.scala index 383ecf72dec..7d8ac103b3c 100644 --- a/tests/slow/src/test/scala/tests/sbt/SbtServerSuite.scala +++ b/tests/slow/src/test/scala/tests/sbt/SbtServerSuite.scala @@ -118,7 +118,7 @@ class SbtServerSuite code <- startSbtServer _ = assert(code == 0) _ = assert(workspace.resolve(".bsp/sbt.json").exists) - _ <- initializer.initialize(workspace, server, client, layout, false) + _ <- initializer.initialize(workspace, server, client, false) _ <- server.initialized() } yield { // should not contain the 'Navigation will not work for this build due to mis-configuration.' message