Merge log level detection

tindzk · Dec 18, 2019 · 62082e1 · 62082e1
1 parent 660051b
commit 62082e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/main/scala/seed/build/Bloop.scala b/src/main/scala/seed/build/Bloop.scala
@@ -478,6 +478,10 @@ object Bsp {
           if (message.contains("BSP server cancelled, closing socket..."))
             // Remove "[E] " from message
             debug(message.dropWhile(_ != ' ').tail)
+          else if (message.contains("[D]"))
+            debug(message.dropWhile(_ != ' ').tail, detail)
+          else if (message.contains("[E]"))
+            super.error(message.dropWhile(_ != ' ').tail, detail)
           else
             super.error(message, detail)
       },

diff --git a/src/main/scala/seed/process/ProcessHelper.scala b/src/main/scala/seed/process/ProcessHelper.scala
@@ -133,17 +133,7 @@ object ProcessHelper {
       List("bloop") ++ args,
       modulePath,
       buildPath,
-      new Log(log.f, log.map, log.level, log.unicode) {
-        override def error(message: String, detail: Boolean = false): Unit =
-          // This message is printed to stderr, but it is not an error, therefore
-          // change log level to 'debug'
-          if (message.contains("[D]"))
-            debug(message.dropWhile(_ != ' ').tail, detail)
-          else if (message.contains("[E]"))
-            super.error(message.dropWhile(_ != ' ').tail, detail)
-          else
-            super.error(message, detail)
-      },
+      log,
       output => onStdOut(output),
       verbose
     )