Merge pull request #331 from adpi2/misc

Minor improvements

Author: adpi2

modules/core/src/main/scala/ch/epfl/scala/debugadapter/internal/LoggingAdapter.scala

@@ -20,7 +20,10 @@ private[debugadapter] class LoggingAdapter(
       case Level.WARNING => logger.warn(message)
       case Level.SEVERE =>
         if (isExpectedDuringCancellation(message) || isIgnoredError(message)) logger.debug(message)
-        else logger.error(message)
+        else {
+          logger.error(message)
+          Option(record.getThrown).foreach(logger.trace(_))
+        }
       case _ => logger.debug(message)
     }
   }

modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/TestingDebugClient.scala

@@ -20,13 +20,14 @@ import scala.util.control.NonFatal
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Promise
 import scala.concurrent.Await
+import ch.epfl.scala.debugadapter.Logger
 
-class TestingDebugClient(socket: Socket, debug: String => Unit)(implicit
+class TestingDebugClient(socket: Socket, logger: Logger)(implicit
     ec: ExecutionContext
 ) extends AbstractDebugClient(
       socket.getInputStream,
       socket.getOutputStream,
-      debug
+      logger
     ) {
   override def close(): Unit = {
     super.close()
@@ -239,12 +240,12 @@ object TestingDebugClient {
   def connect(
       uri: URI,
       timeout: Duration = 4.seconds,
-      debug: String => Unit = _ => ()
+      logger: Logger = NoopLogger
   )(implicit ec: ExecutionContext): TestingDebugClient = {
     val socket = new Socket()
     val address = new InetSocketAddress(uri.getHost, uri.getPort)
     socket.connect(address, timeout.toMillis.intValue)
-    val client = new TestingDebugClient(socket, debug)
+    val client = new TestingDebugClient(socket, logger)
     val listening = new java.lang.Thread {
       override def run(): Unit = client.run()
     }
@@ -256,7 +257,7 @@ object TestingDebugClient {
 class AbstractDebugClient(
     input: InputStream,
     output: OutputStream,
-    debug: String => Unit
+    logger: Logger
 ) {
   private final val BufferSize = 4096
   private final val TwoCRLF = "\r\n\r\n"
@@ -339,7 +340,7 @@ class AbstractDebugClient(
         .flatten
     rawMessages.foreach { raw =>
       try {
-        debug(s"Received $raw")
+        logger.debug(s"Received $raw")
         val message = JsonUtils.fromJson(raw, classOf[Messages.ProtocolMessage])
 
         if (message.`type`.equals("response")) {
@@ -387,7 +388,7 @@ class AbstractDebugClient(
     try {
       this.writer.write(data)
       this.writer.flush()
-      debug(s"Sent $jsonMessage")
+      logger.debug(s"Sent $jsonMessage")
     } catch {
       case NonFatal(e) =>
         System.err.println(s"Write data to io exception: ${e.getMessage}")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0-RC1