Cut off update: warnings, build reason, log file

Author: wclr

app/Command/Compile.hs

@@ -16,12 +16,13 @@ import Language.PureScript qualified as P
 import Language.PureScript.CST qualified as CST
 import Language.PureScript.Errors.JSON (JSONResult(..), toJSONErrors)
 import Language.PureScript.Glob (toInputGlobs, PSCGlobs(..), warnFileTypeNotFound)
-import Language.PureScript.Make (buildMakeActions, inferForeignModules, runMake)
+import Language.PureScript.Make (buildMakeActions, inferForeignModules, progressWithFile, printProgress, runMake)
 import Options.Applicative qualified as Opts
 import SharedCLI qualified
 import System.Console.ANSI qualified as ANSI
 import System.Exit (exitSuccess, exitFailure)
-import System.Directory (getCurrentDirectory)
+import System.FilePath ((</>))
+import System.Directory (createDirectoryIfMissing, getCurrentDirectory)
 import System.IO (hPutStr, stderr, stdout)
 import System.IO.UTF8 (readUTF8FilesT)
 
@@ -68,11 +69,18 @@ compile PSCMakeOptions{..} = do
                              ]
     exitFailure
   moduleFiles <- readUTF8FilesT input
+
+  _ <- createDirectoryIfMissing True pscmOutputDir
+  let logFile = pscmOutputDir </> "compile.log"
+  let cleanFile = True
+
   (makeErrors, makeWarnings) <- runMake pscmOpts $ do
     ms <- CST.parseModulesFromFiles id moduleFiles
     let filePathMap = M.fromList $ map (\(fp, pm) -> (P.getModuleName $ CST.resPartial pm, Right fp)) ms
     foreigns <- inferForeignModules filePathMap
-    let makeActions = buildMakeActions pscmOutputDir filePathMap foreigns pscmUsePrefix
+    logProgress <- progressWithFile logFile cleanFile
+    let makeActions = (buildMakeActions pscmOutputDir filePathMap foreigns pscmUsePrefix)
+            { P.progress = (*>) <$> printProgress <*> logProgress }
     P.make_ makeActions (map snd ms)
   printWarningsAndErrors (P.optionsVerboseErrors pscmOpts) pscmJSONErrors moduleFiles makeWarnings makeErrors
   exitSuccess

src/Language/PureScript/AST/SourcePos.hs

@@ -116,3 +116,6 @@ widenSourceSpan (SourceSpan n1 s1 e1) (SourceSpan n2 s2 e2) =
 
 widenSourceAnn :: SourceAnn -> SourceAnn -> SourceAnn
 widenSourceAnn (s1, _) (s2, _) = (widenSourceSpan s1 s2, [])
+
+replaceSpanName :: String -> SourceSpan -> SourceSpan
+replaceSpanName name (SourceSpan _ sps spe) = SourceSpan name sps spe

src/Language/PureScript/Docs/Collect.hs

@@ -96,7 +96,7 @@ compileForDocs outputDir inputFiles = do
       foreigns <- P.inferForeignModules filePathMap
       let makeActions =
             (P.buildMakeActions outputDir filePathMap foreigns False)
-              { P.progress = liftIO . TIO.hPutStr stdout . (<> "\n") . P.renderProgressMessage "documentation for "
+              { P.progress = liftIO . maybe (pure ()) (TIO.hPutStr stdout . (<> "\n")) . P.renderProgressMessage "documentation for "
               }
       P.make makeActions (map snd ms)
   either throwError return result

src/Language/PureScript/Ide/Rebuild.hs

@@ -80,7 +80,7 @@ rebuildFile file actualFile codegenTargets runOpenBuild = do
   -- Rebuild the single module using the cached externs
   (result, warnings) <- logPerf (labelTimespec "Rebuilding Module") $
     liftIO $ P.runMake (P.defaultOptions { P.optionsCodegenTargets = codegenTargets }) do
-      newExterns <- P.rebuildModule makeEnv externs m
+      newExterns <- P.rebuildModule makeEnv externs (pwarnings, m)
       unless pureRebuild
         $ updateCacheDb codegenTargets outputDirectory file actualFile moduleName
       pure newExterns
@@ -166,7 +166,7 @@ rebuildModuleOpen
   -> m ()
 rebuildModuleOpen makeEnv externs m = void $ runExceptT do
   (openResult, _) <- liftIO $ P.runMake P.defaultOptions $
-    P.rebuildModule (shushProgress (shushCodegen makeEnv)) externs (openModuleExports m)
+    P.rebuildModule (shushProgress (shushCodegen makeEnv)) externs (mempty, openModuleExports m)
   case openResult of
     Left _ ->
       throwError (GeneralError "Failed when rebuilding with open exports")
@@ -183,7 +183,7 @@ shushProgress ma =
 -- | Stops any kind of codegen
 shushCodegen :: Monad m => P.MakeActions m -> P.MakeActions m
 shushCodegen ma =
-  ma { P.codegen = \_ _ _ -> pure ()
+  ma { P.codegen = \_ _ _ _ -> pure ()
      , P.ffiCodegen = \_ -> pure ()
      }
 

src/Language/PureScript/Interactive.hs

@@ -60,7 +60,7 @@ rebuild
   -> P.Module
   -> P.Make (P.ExternsFile, P.Environment)
 rebuild loadedExterns m = do
-    externs <- P.rebuildModule buildActions loadedExterns m
+    externs <- P.rebuildModule buildActions loadedExterns (mempty, m)
     return (externs, foldl' (flip P.applyExternsFileToEnvironment) P.initEnvironment (loadedExterns ++ [externs]))
   where
     buildActions :: P.MakeActions P.Make