Merge pull request #6177 from develop7/fix-ellipsize-progress

Ellipsize build progress output line

Author: mpilgrem

ChangeLog.md

@@ -6,6 +6,9 @@ Release notes:
 
 * Further to the release notes for Stack 2.3.1, the `-static` suffix has been
   removed from the statically linked Linux/x86_64 binaries.
+* The build progress line gets ellipsized in order to fit one terminal line
+  matching cargo behavior and preventing logSticky spam on narrow 
+  terminals and lots of dependencies building simultaneously
 
 **Changes since v2.11.1:**
 

src/Stack/Build/Execute.hs

@@ -785,6 +785,7 @@ executePlan' installedMap0 targets plan ee@ExecuteEnv {..} = do
   let keepGoing =
         fromMaybe (not (Map.null (planFinals plan))) (boptsKeepGoing eeBuildOpts)
   terminal <- view terminalL
+  terminalWidth <- view termWidthL
   errs <- liftIO $ runActions threads keepGoing actions $
     \doneVar actionsVar -> do
       let total = length actions
@@ -803,10 +804,16 @@ executePlan' installedMap0 targets plan ee@ExecuteEnv {..} = do
                         ": "
                       : L.intersperse ", "
                           (map (fromString . packageNameString) names)
+                    progressLine prev' total' = 
+                        "Progress " <> display prev' <> "/" <> display total' <>
+                            nowBuilding packageNames
+                    ellipsize n text = 
+                        if T.length text <= n
+                        then text
+                        else T.take (n - 1) text <> "…"
                 when terminal $ run $
-                  logSticky $
-                    "Progress " <> display prev <> "/" <> display total <>
-                        nowBuilding packageNames
+                  logSticky $ display $ ellipsize terminalWidth $ 
+                    utf8BuilderToText $ progressLine prev total
                 done <- atomically $ do
                   done <- readTVar doneVar
                   check $ done /= prev