From bf29e2a908daaa4bb438c7a3d951b884fc3ecacb Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 24 Feb 2021 17:31:28 +0100 Subject: [PATCH] Fix size of server running message --- .../src/main/scala/sbt/internal/util/ProgressState.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ProgressState.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ProgressState.scala index ee58e0762..37ba3ccab 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ProgressState.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ProgressState.scala @@ -156,7 +156,7 @@ private[sbt] final class ProgressState( private[sbt] object ProgressState { private val SERVER_IS_RUNNING = "sbt server is running " // the + 2 is for the quotation marks - private val SERVER_IS_RUNNING_LENGTH = SERVER_IS_RUNNING.length + 2 + private val SERVER_IS_RUNNING_LENGTH = SERVER_IS_RUNNING.length + 3 /** * Receives a new task report and replaces the old one. In the event that the new @@ -174,7 +174,6 @@ private[sbt] object ProgressState { val isRunning = terminal.prompt == Prompt.Running val isBatch = terminal.prompt == Prompt.Batch val isWatch = terminal.prompt == Prompt.Watch - val noPrompt = terminal.prompt == Prompt.NoPrompt if (terminal.isSupershellEnabled) { setShowProgress(true) // used by Zinc to not show "done compiling" if (!pe.skipIfActive.getOrElse(false) || (!isRunning && !isBatch)) { @@ -193,8 +192,7 @@ private[sbt] object ProgressState { pe.command.toSeq.flatMap { cmd => val width = terminal.getWidth val sanitized = if ((cmd.length + SERVER_IS_RUNNING_LENGTH) > width) { - if (SERVER_IS_RUNNING_LENGTH + cmd.length < width) cmd - else cmd.take(cmd.length - 3 - SERVER_IS_RUNNING_LENGTH) + "..." + cmd.take(width - 3 - SERVER_IS_RUNNING_LENGTH) + "..." } else cmd val tail = if (isWatch) Nil else "enter 'cancel' to stop evaluation" :: Nil s"$SERVER_IS_RUNNING '$sanitized'" :: tail