post merge fix

scalameta · Apr 7, 2023 · df0bbca · df0bbca
1 parent d0b1151
commit df0bbca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -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
@@ -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
@@ -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