NIT combine newline message and the next one

VirtusLab · Mar 21, 2023 · c08a49f · c08a49f
1 parent 8f49131
commit c08a49f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/modules/cli/src/main/scala/scala/cli/commands/publish/PublishSetup.scala b/modules/cli/src/main/scala/scala/cli/commands/publish/PublishSetup.scala
@@ -281,8 +281,10 @@ object PublishSetup extends ScalaCommand[PublishSetupOptions] {
           val updatedContent = currentContent ++
             extraLines.toArray.flatMap(_.getBytes(StandardCharsets.UTF_8))
           os.write.over(dest, updatedContent)
-          logger.message("") // printing an empty line, for readability
-          logger.message(s"Wrote ${CommandUtils.printablePath(dest)}")
+          logger.message(
+            s"""
+               |Wrote ${CommandUtils.printablePath(dest)}""".stripMargin
+          ) // printing an empty line, for readability
           written = written :+ dest
         }
       }

diff --git a/modules/cli/src/main/scala/scala/cli/commands/publish/checks/PgpSecretKeyCheck.scala b/modules/cli/src/main/scala/scala/cli/commands/publish/checks/PgpSecretKeyCheck.scala
@@ -199,10 +199,10 @@ final case class PgpSecretKeyCheck(
     either {
       keyIdOpt match
         case None =>
-          logger.message("") // printing an empty line, for readability
           logger.message(
-            "Warning: no public key passed, not checking if the key needs to be uploaded to a key server."
-          )
+            """
+              |Warning: no public key passed, not checking if the key needs to be uploaded to a key server.""".stripMargin
+          ) // printing an empty line, for readability
         case Some(pubKeyConfigPasswordOption) =>
           val publicKeyString = pubKeyConfigPasswordOption.get(configDb())
             .orThrow
@@ -222,8 +222,10 @@ final case class PgpSecretKeyCheck(
           value(keyServers)
             .map { keyServer =>
               if (options.dummy) {
-                logger.message("") // printing an empty line, for readability
-                logger.message(s"Would upload key 0x${keyId.stripPrefix("0x")} to $keyServer")
+                logger.message(
+                  s"""
+                     |Would upload key 0x${keyId.stripPrefix("0x")} to $keyServer""".stripMargin
+                ) // printing an empty line, for readability
                 Right(())
               }
               else {
@@ -248,8 +250,10 @@ final case class PgpSecretKeyCheck(
                         )
                     }
                     logger.debug(s"Key server upload response: $resp")
-                    logger.message("") // printing an empty line, for readability
-                    logger.message(s"Uploaded key 0x${keyId.stripPrefix("0x")} to $keyServer")
+                    logger.message(
+                      s"""
+                         |Uploaded key 0x${keyId.stripPrefix("0x")} to $keyServer""".stripMargin
+                    ) // printing an empty line, for readability
                   }
                 }
                 e