Forward --debug option to BSP server

lefou · Aug 17, 2022 · 3328d99 · 3328d99
1 parent cc03392
commit 3328d99
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 9 deletions.
diff --git a/bsp/src/mill/bsp/BSP.scala b/bsp/src/mill/bsp/BSP.scala
@@ -48,11 +48,11 @@ object BSP extends ExternalModule {
       val bspFile = bspDirectory / s"${serverName}.json"
       if (os.exists(bspFile)) T.log.info(s"Overwriting BSP connection file: ${bspFile}")
       else T.log.info(s"Creating BSP connection file: ${bspFile}")
-      os.write.over(bspFile, createBspConnectionJson(jobs), createFolders = true)
+      os.write.over(bspFile, createBspConnectionJson(jobs, T.log.debugEnabled), createFolders = true)
     }
 
   // creates a Json with the BSP connection details
-  def createBspConnectionJson(jobs: Int): String = {
+  def createBspConnectionJson(jobs: Int, debug: Boolean): String = {
     // we assume, the classpath is an executable jar here, FIXME
     val millPath = sys.props
       .get("java.class.path")
@@ -69,8 +69,7 @@ object BSP extends ExternalModule {
           "false",
           "--jobs",
           s"${jobs}"
-//          s"${BSP.getClass.getCanonicalName.split("[$]").head}/start"
-        ),
+        ) ++ (if(debug) Seq("--debug") else Seq()),
         millVersion = BuildInfo.millVersion,
         bspVersion = bspProtocolVersion,
         languages = languages

diff --git a/main/api/src/mill/api/Logger.scala b/main/api/src/mill/api/Logger.scala
@@ -1,6 +1,6 @@
 package mill.api
 
-import java.io._
+import java.io.{InputStream, PrintStream}
 
 /**
  * The standard logging interface of the Mill build tool.

diff --git a/main/core/src/mill/eval/Evaluator.scala b/main/core/src/mill/eval/Evaluator.scala
@@ -669,8 +669,10 @@ class Evaluator private[Evaluator] (
       case Some(path) => MultiLogger(
           logger.colored,
           logger,
+          // we always enable debug here, to get some more context in log files
           new FileLogger(logger.colored, path, debugEnabled = true),
-          logger.inStream
+          logger.inStream,
+          debugEnabled = logger.debugEnabled
         )
     }
 

diff --git a/main/util/src/mill/util/Loggers.scala b/main/util/src/mill/util/Loggers.scala
@@ -235,8 +235,13 @@ class MultiStream(stream1: OutputStream, stream2: OutputStream)
       }
     })
 
-case class MultiLogger(colored: Boolean, logger1: Logger, logger2: Logger, inStream: InputStream)
-    extends Logger {
+class MultiLogger(
+    override val colored: Boolean,
+    logger1: Logger,
+    logger2: Logger,
+    override val inStream: InputStream,
+    override val debugEnabled: Boolean
+) extends Logger {
 
   lazy val outputStream: PrintStream = new MultiStream(logger1.outputStream, logger2.outputStream)
 
@@ -264,8 +269,32 @@ case class MultiLogger(colored: Boolean, logger1: Logger, logger2: Logger, inStr
     logger1.close()
     logger2.close()
   }
+}
 
-  override def debugEnabled: Boolean = logger1.debugEnabled || logger2.debugEnabled
+object MultiLogger {
+
+  def apply(
+      colored: Boolean,
+      logger1: Logger,
+      logger2: Logger,
+      inStream: InputStream,
+      debugEnabled: Boolean
+  ): MultiLogger =
+    new MultiLogger(colored, logger1, logger2, inStream, debugEnabled)
+
+  def apply(
+      colored: Boolean,
+      logger1: Logger,
+      logger2: Logger,
+      inStream: InputStream
+  ): MultiLogger =
+    MultiLogger(
+      colored,
+      logger1,
+      logger2,
+      inStream,
+      debugEnabled = logger1.debugEnabled || logger2.debugEnabled
+    )
 }
 
 /**