Refine helpers to make consuming stdErr output more explicit

Author: supermario

ext-common/Ext/Common.hs

@@ -7,6 +7,7 @@ import Control.Concurrent
 import Control.Concurrent.MVar
 import Control.Monad (unless)
 import Control.Arrow ((>>>))
+import qualified GHC.IO.Exception
 
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as BSL
@@ -373,40 +374,42 @@ ghciThreads = unsafePerformIO $ newMVar []
 -- System
 
 bash :: String -> IO String
-bash command =
-  c_ "bash" ["-c", command] ""
+bash command = do
+  (exit, stdOut, stdErr) <- c_ "bash" ["-c", command] ""
+  pure $ show $ stdErr <> stdOut
 
 bashq :: String -> IO String
-bashq command =
-  cq_ "bash" ["-c", command] ""
+bashq command = do
+  (exit, stdOut, stdErr) <- cq_ "bash" ["-c", command] ""
+  pure $ show $ stdErr <> stdOut
 
 
-c_ :: String -> [String] -> String -> IO String
+-- Call executable and print output in debug mode
+c_ :: String -> [String] -> String -> IO (GHC.IO.Exception.ExitCode, String, String)
 c_ bin args input = do
   atomicPutStrLnDebug $ "🤖  " <> bin <> " " <> show args <> " " <> input
   (exit, stdOut, stdErr) <- System.Process.readProcessWithExitCode bin args input
-  res <-
-    if Prelude.length stdErr > 0
-      then pure stdErr
-      else pure stdOut
   -- This doesn't quite work for debugging because bash will honour the sequence codes of the output
   -- which gives us confusing results. I.e. Elm compilation clears the buffer during operation
   -- onlyWhen (Prelude.length stdErr > 0) $ atomicPutStrLnDebug $ "└── stdErr: " <> stdErr
   -- onlyWhen (Prelude.length stdOut > 0) $ atomicPutStrLnDebug $ "└── stdOut: " <> stdOut
   -- This doesn't happen with the show instance as it escapes sequences inside the string
   atomicPutStrLnDebug $ "└── " <> show (exit, stdOut, stdErr)
-  pure $ show (exit, stdOut, stdErr)
+  pure $ (exit, stdOut, stdErr)
 
 
-cq_ :: String -> [String] -> String -> IO String
+-- Call quiet, don't print output in debug mode
+cq_ :: String -> [String] -> String -> IO (GHC.IO.Exception.ExitCode, String, String)
 cq_ bin args input = do
   atomicPutStrLnDebug $ "🤖  " <> bin <> " " <> show args <> " " <> input
   (exit, stdOut, stdErr) <- System.Process.readProcessWithExitCode bin args input
-  res <-
-    if Prelude.length stdErr > 0
-      then pure stdErr
-      else pure stdOut
-  pure $ show (exit, stdOut, stdErr)
+  pure $ (exit, stdOut, stdErr)
+
+
+execCombineStdOutErr :: String -> [String] -> String -> IO String
+execCombineStdOutErr bin args input = do
+  (exit, stdOut, stdErr) <- c_ bin args input
+  pure $ stdErr <> stdOut
 
 
 requireBinary :: String -> IO FilePath

extra/Lamdera/CLI/Live.hs

@@ -466,39 +466,39 @@ editors :: FilePath -> [IO (Maybe (B.Builder, EditorOpenIO))]
 editors projectRoot =
   [ detectEditor "custom-*nix"
       (Dir.doesFileExist (projectRoot </> "openEditor.sh"))
-      (\file row column -> Ext.Common.cq_ (projectRoot </> "openEditor.sh") [file, T.unpack row, T.unpack column] "")
+      (\file row column -> Ext.Common.execCombineStdOutErr (projectRoot </> "openEditor.sh") [file, T.unpack row, T.unpack column] "")
 
   , detectEditor "custom-windows"
       (do
         exists <- Dir.doesFileExist (projectRoot </> "openEditor.bat")
         pure $ exists && ostype == Windows
       )
-      (\file row column -> Ext.Common.cq_ (projectRoot </> "openEditor.bat") [file, T.unpack row, T.unpack column] "")
+      (\file row column -> Ext.Common.execCombineStdOutErr (projectRoot </> "openEditor.bat") [file, T.unpack row, T.unpack column] "")
 
   , detectExecutable "code-insiders"
       (\executablePath file row column -> do
-        Ext.Common.c_ executablePath [ "-g", file <> ":" <> T.unpack row <> ":" <> T.unpack column] ""
+        Ext.Common.execCombineStdOutErr executablePath [ "-g", file <> ":" <> T.unpack row <> ":" <> T.unpack column] ""
       )
 
   , detectExecutable "code"
       (\executablePath file row column -> do
-        Ext.Common.c_ executablePath [ "-g", file <> ":" <> T.unpack row <> ":" <> T.unpack column] ""
+        Ext.Common.execCombineStdOutErr executablePath [ "-g", file <> ":" <> T.unpack row <> ":" <> T.unpack column] ""
       )
 
   , detectEditor "intellij-ce"
       (Dir.doesDirectoryExist "/Applications/IntelliJ IDEA CE.app")
       (\file row column -> do
         let column_ :: Int = column & readMaybeText & withDefault 1
         -- IntelliJ seems to number it's columns from 1 index
-        Ext.Common.cq_  "open" ["-na", "IntelliJ IDEA CE.app", "--args", "--line", T.unpack row, "--column", show (column_ - 1), file] ""
+        Ext.Common.execCombineStdOutErr "open" ["-na", "IntelliJ IDEA CE.app", "--args", "--line", T.unpack row, "--column", show (column_ - 1), file] ""
       )
 
   , detectEditor "intellij"
       (Dir.doesDirectoryExist "/Applications/IntelliJ IDEA.app")
       (\file row column -> do
         let column_ :: Int = column & readMaybeText & withDefault 1
         -- IntelliJ seems to number it's columns from 1 index
-        Ext.Common.cq_  "open" ["-na", "IntelliJ IDEA.app", "--args", "--line", T.unpack row, "--column", show (column_ - 1), file] ""
+        Ext.Common.execCombineStdOutErr "open" ["-na", "IntelliJ IDEA.app", "--args", "--line", T.unpack row, "--column", show (column_ - 1), file] ""
       )
   ]
 

extra/Lamdera/Injection.hs

@@ -386,7 +386,7 @@ esbuildIncluder root esbuildPath includesPath = do
     Nothing -> do
       Lamdera.debug_ "Building elm-pkg-js-includes.js"
       -- packaged <- Ext.Common.cq_ esbuildPath [ includesPath, "--bundle", "--global-name=elmPkgJsIncludes" ] ""
-      packaged <- Ext.Common.cq_ esbuildPath [ includesPath, "--bundle", "--minify", "--global-name=elmPkgJsIncludes" ] ""
+      (exit, packaged, stdErr) <- Ext.Common.cq_ esbuildPath [ includesPath, "--bundle", "--minify", "--global-name=elmPkgJsIncludes" ] ""
       packaged
         & Ext.Common.stringToBuilder
         -- & debugHaskell "minified elmpkgjs"