Improve elm format error messages and file handling

Author: CharlonTank

ext-common/Ext/ElmFormat.hs

@@ -9,6 +9,7 @@ module Ext.ElmFormat where
 import Data.Text (Text)
 import qualified Data.Text as T
 import qualified Data.Text as Text
+import System.IO (FilePath)
 
 import System.IO.Unsafe (unsafePerformIO)
 import qualified System.Process
@@ -20,31 +21,35 @@ import qualified ElmFormat.Cli
 -- import qualified ElmFormat.Render.Text as Render
 import ElmVersion
 import ElmFormat.Messages
+import Reporting.Annotation (Located(..), Region(..), Position(..))
+import CommandLine.InfoFormatter (ToConsole(..))
 
 
-formatWithEmbedded :: Text -> Either ElmFormat.Messages.InfoMessage Text
-formatWithEmbedded inputText = do
-  ElmFormat.Cli.format ElmVersion.Elm_0_19 ("stdin:nofilepath", inputText)
+formatWithEmbedded :: FilePath -> Text -> Either ElmFormat.Messages.InfoMessage Text
+formatWithEmbedded filePath inputText = do
+  ElmFormat.Cli.format ElmVersion.Elm_0_19 (filePath, inputText)
 
 
-format :: Text -> (Either Text Text)
-format text = do
-  case formatWithEmbedded text of
-    Left err ->
-      Left $ Lamdera.show_ err
-    Right formatted ->
-      Right formatted
+format :: FilePath -> Text -> (Either Text Text)
+format filePath text = do
+  case formatWithEmbedded filePath text of
+    Left err -> Left $ toConsole err
+    Right formatted -> Right formatted
 
 
 formatOrPassthrough :: Text -> Text
 formatOrPassthrough text = do
-  case format text of
+  case format "stdin" text of
     Right formatted -> formatted
-    Left err -> do
-      -- let !_ = Lamdera.debug $ "🔥💅 warning: " <> show err
-      text
+    Left _ -> text
 
 
+formatOrPassthroughFile :: FilePath -> Text -> Text
+formatOrPassthroughFile filePath text = do
+  case format filePath text of
+    Right formatted -> formatted
+    Left _ -> text
+
 
 -- Old versions that rely on local elm-format binary
 

extra/Lamdera/CLI/Format.hs

@@ -142,7 +142,7 @@ run inputs flags =
 
 formatText :: Format -> T.Text -> IO ()
 formatText flags input =
-  case ElmFormat.format input of
+  case ElmFormat.format "stdin" input of
     Right formatted ->
       TIO.putStr formatted
     Left err ->
@@ -199,26 +199,18 @@ formatSingleFile :: Format -> FilePath -> IO ()
 formatSingleFile flags path = do
   TIO.putStrLn $ "Processing file " <> T.pack path
   input <- TIO.readFile path
-  case ElmFormat.format input of
-    Right formatted ->
-      if _validate flags
-        then
-          if input == formatted
-            then return ()
-            else do
-              TIO.putStrLn $ "File " <> T.pack path <> " would be reformatted"
-              Exit.exitFailure
+  case ElmFormat.format path input of
+    Right formatted -> 
+      if _validate flags && formatted /= input
+        then do
+          TIO.putStrLn $ "File " <> T.pack path <> " would be reformatted"
+          Exit.exitFailure
         else case _output flags of
-          Just outputPath ->
-            TIO.writeFile outputPath formatted
-          Nothing ->
-            TIO.writeFile path formatted
-    Left err ->
-      do
-        TIO.putStrLn $ "Unable to parse file " <> T.pack path <> ": " <> err <> " To see a detailed explanation, run elm make on the file."
-        if _validate flags
-          then Exit.exitFailure
-          else return ()
+          Just outputPath -> TIO.writeFile outputPath formatted
+          Nothing -> TIO.writeFile path formatted
+    Left err -> do
+      TIO.putStrLn err
+      Exit.exitFailure
 
 stack :: [P.Doc] -> P.Doc
 stack docs =