?

almond-sh · Jun 3, 2024 · 8f9894c · 8f9894c
1 parent 482a1aa
commit 8f9894c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 33 deletions.
diff --git a/modules/scala/scala-interpreter/src/main/scala/almond/VariableInspectorApiImpl.scala b/modules/scala/scala-interpreter/src/main/scala/almond/VariableInspectorApiImpl.scala
@@ -106,9 +106,9 @@ private object VariableInspectorApiImpl {
                 )
                 .map(_.render)
                 .mkString
-                .replaceAll(java.util.regex.Pattern.quote("(") + "\n\\s+", "(")
-                .replaceAll("\n\\s+", " ")
-                .replaceAll("\n", " ")
+                .replaceAll(java.util.regex.Pattern.quote("(") + "\r?\n\\s+", "(")
+                .replaceAll("\r?\n\\s+", " ")
+                .replaceAll("\r?\n", " ")
           },
         varType = tprint.render(TPrintColors.BlackWhite).render,
         isMatrix = false,

diff --git a/modules/scala/scala-kernel/src/main/scala/almond/ScalaKernel.scala b/modules/scala/scala-kernel/src/main/scala/almond/ScalaKernel.scala
@@ -115,7 +115,7 @@ object ScalaKernel extends CaseApp[Options] {
             case (trigger, auto) =>
               Seq("Auto dependency:", s"  Trigger: $trigger") ++ auto.map(dep => s"  Adds: $dep")
           }
-          .mkString("\n")
+          .mkString(System.lineSeparator())
       )
 
     val interpreterEc               = singleThreadedExecutionContext("scala-interpreter")

diff --git a/modules/shared/channels/src/main/scala/almond/channels/zeromq/ZeromqSocketImpl.scala b/modules/shared/channels/src/main/scala/almond/channels/zeromq/ZeromqSocketImpl.scala
@@ -138,20 +138,21 @@ final class ZeromqSocketImpl(
 
         ensureOpened()
 
-        log.debug(
-          "Sending:\n" +
+        log.debug {
+          val nl = System.lineSeparator()
+          "Sending:" + nl +
             "  header: " +
             Try(new String(message.header, "UTF-8"))
               .toOption
               .getOrElse(message.header.toString) +
-            "\n" +
+            nl +
             "  content: " +
             Try(new String(message.content, "UTF-8"))
               .toOption
               .getOrElse(message.content.toString) +
-            "\n" +
+            nl +
             "  idents: " + identsAsStrings(message.idents)
-        )
+        }
 
         for (c <- message.idents)
           channel.send(c.toArray, ZMQ.SNDMORE)
@@ -196,17 +197,18 @@ final class ZeromqSocketImpl(
 
       if (expectedSignature == signature || !enableMac) {
         log.debug {
+          val nl = System.lineSeparator()
           val headerStr = Try(new String(message.header, UTF_8))
             .getOrElse(message.header.toString)
-          s"Received on $uri:\n" +
+          s"Received on $uri:" + nl +
             "  header: " +
             headerStr +
-            "\n" +
+            nl +
             "  content: " +
             Try(new String(message.content, "UTF-8"))
               .toOption
               .getOrElse(message.content.toString) +
-            "\n" +
+            nl +
             "  idents: " + identsAsStrings(message.idents)
         }
         Some(message)

diff --git a/modules/shared/interpreter/src/main/scala/almond/interpreter/input/InputManager.scala b/modules/shared/interpreter/src/main/scala/almond/interpreter/input/InputManager.scala
@@ -49,7 +49,7 @@ object InputManager {
 
           res match {
             case Success(value) =>
-              val b0 = ByteBuffer.wrap((value + "\n").getBytes(UTF_8)).asReadOnlyBuffer()
+              val b0 = ByteBuffer.wrap((value + System.lineSeparator()).getBytes(UTF_8)).asReadOnlyBuffer()
               bufferOpt = Some(b0)
             case Failure(_: NoMoreInputException) =>
               done = true

diff --git a/...shared/interpreter/src/main/scala/almond/interpreter/messagehandlers/MessageHandler.scala b/...shared/interpreter/src/main/scala/almond/interpreter/messagehandlers/MessageHandler.scala
@@ -53,7 +53,7 @@ final case class MessageHandler(
   ): Option[Stream[IO, (Channel, RawMessage)]] =
     handle(channel, message).map {
       case Left(e) =>
-        log.error(s"Ignoring error decoding message\n$message", e)
+        log.error(s"Ignoring error decoding message${System.lineSeparator()}$message", e)
         Stream.empty
       case Right(s) => s
     }

diff --git a/modules/shared/kernel/src/main/scala/almond/kernel/Kernel.scala b/modules/shared/kernel/src/main/scala/almond/kernel/Kernel.scala
@@ -127,7 +127,7 @@ final case class Kernel(
 
                   immediateHandlers.handleOrLogError(channel, rawMessage, log) match {
                     case None =>
-                      log.warn(s"Ignoring unhandled message on $channel:\n$rawMessage")
+                      log.warn(s"Ignoring unhandled message on $channel:${System.lineSeparator()}$rawMessage")
                       IO.unit
 
                     case Some(output) =>

diff --git a/modules/shared/logger/src/main/scala/almond/logger/internal/PrintStreamLogger.scala b/modules/shared/logger/src/main/scala/almond/logger/internal/PrintStreamLogger.scala
@@ -5,8 +5,6 @@ import java.lang.management.ManagementFactory
 
 import almond.logger.Level
 
-import scala.annotation.tailrec
-
 final class PrintStreamLogger(
   val level: Level,
   out: PrintStream,
@@ -33,21 +31,8 @@ final class PrintStreamLogger(
     b += ' '
     b ++= message
 
-    @tailrec
-    def addException(ex: Throwable): Unit =
-      if (ex != null) {
-        b += '\n' // FIXME Not portable
-        b ++= ex.toString
-        for (elem <- ex.getStackTrace) {
-          b ++= "\n  " // FIXME Not portable
-          b ++= elem.toString
-        }
-        addException(ex.getCause)
-      }
-
-    addException(exception)
-
     out.println(b.result())
+    exception.printStackTrace(out)
   }
 }
 

diff --git a/modules/shared/test-kit/src/main/scala/almond/testkit/ClientStreams.scala b/modules/shared/test-kit/src/main/scala/almond/testkit/ClientStreams.scala
@@ -36,7 +36,7 @@ final case class ClientStreams(
         case Right((`channel`, m)) =>
           m.decodeAs[T] match {
             case Left(err) =>
-              throw new Exception(s"Error decoding message: $err\n$m")
+              throw new Exception(s"Error decoding message: $err${System.lineSeparator()}$m")
             case Right(m0) =>
               m0
           }
@@ -58,7 +58,7 @@ final case class ClientStreams(
         case Left((`channel`, m)) if m.header.msg_type == msgType.messageType =>
           m.decodeAs[T] match {
             case Left(err) =>
-              throw new Exception(s"Error decoding message: $err\n$m")
+              throw new Exception(s"Error decoding message: $err${System.lineSeparator()}$m")
             case Right(m0) =>
               m0
           }