CliOptions: move NoopOutputStream to new Output

scalafmt-cli/src/main/scala/org/scalafmt/cli/CliOptions.scala

@@ -8,7 +8,6 @@ import org.scalafmt.sysops.GitOps
 import org.scalafmt.sysops.OsSpecific
 
 import java.io.InputStream
-import java.io.OutputStream
 import java.io.PrintStream
 import java.nio.file.Files
 import java.nio.file.NoSuchFileException
@@ -60,28 +59,17 @@ object CliOptions {
 
   private def guardPrintStream(p: => Boolean)(
       candidate: PrintStream,
-  ): PrintStream = if (p) NoopOutputStream.printStream else candidate
+  ): PrintStream = if (p) Output.NoopStream.printStream else candidate
 
 }
 
-object NoopOutputStream extends OutputStream {
-  self =>
-  override def write(b: Int): Unit = ()
-
-  override def write(b: Array[Byte]): Unit = ()
-
-  override def write(b: Array[Byte], off: Int, len: Int): Unit = ()
-
-  val printStream = new PrintStream(self)
-}
-
 case class CommonOptions(
     private val cwd: Option[AbsoluteFile] = None,
     out: PrintStream = System.out,
     in: InputStream = System.in,
     err: PrintStream = System.err,
-    debug: PrintStream = NoopOutputStream.printStream,
-    info: PrintStream = NoopOutputStream.printStream,
+    debug: PrintStream = Output.NoopStream.printStream,
+    info: PrintStream = Output.NoopStream.printStream,
 ) {
   private[cli] lazy val workingDirectory: AbsoluteFile = cwd
     .getOrElse(AbsoluteFile.userDir)

scalafmt-cli/src/main/scala/org/scalafmt/cli/Output.scala

@@ -0,0 +1,21 @@
+package org.scalafmt.cli
+
+import java.io._
+
+object Output {
+
+  object NoopStream extends OutputStream {
+    self =>
+    override def write(b: Int): Unit = ()
+
+    override def write(b: Array[Byte]): Unit = ()
+
+    override def write(b: Array[Byte], off: Int, len: Int): Unit = ()
+
+    def outputStream: OutputStream = self
+    val printStream = new PrintStream(self)
+    val printWriter = new PrintWriter(self)
+    val streamWriter = new OutputStreamWriter(self)
+  }
+
+}

scalafmt-tests/src/test/scala/org/scalafmt/cli/CliOptionsTest.scala

@@ -108,7 +108,7 @@ class CliOptionsTest extends FunSuite {
     val stdoutArgs = Array("--stdout")
     for (args <- Seq(stdinArgs, stdoutArgs)) {
       val options = Cli.getConfig(args, baseCliOptions).get
-      assertEquals(options.common.info, NoopOutputStream.printStream)
+      assertEquals(options.common.info, Output.NoopStream.printStream)
     }
   }
 }

scalafmt-tests/src/test/scala/org/scalafmt/cli/CliTest.scala

@@ -555,7 +555,7 @@ trait CliTestBehavior {
     }
 
     test(s"command line argument error: $label") {
-      val exit = Console.withErr(NoopOutputStream.printStream) {
+      val exit = Console.withErr(Output.NoopStream.printStream) {
         Cli.mainWithOptions(
           Array("--foobar"),
           getMockOptions(AbsoluteFile.userDir),

scalafmt-tests/src/test/scala/org/scalafmt/cli/FileTestOps.scala

@@ -49,7 +49,7 @@ object FileTestOps {
   def getMockOptions(
       baseDir: AbsoluteFile,
       workingDir: AbsoluteFile,
-      out: PrintStream = NoopOutputStream.printStream,
+      out: PrintStream = Output.NoopStream.printStream,
   ): CliOptions = CliOptions.default.copy(
     baseConfig = ScalafmtConfig.default,
     gitOpsConstructor = _ => new FakeGitOps(baseDir),