[#92] Switch to fourmolu formatter

.headroom.yaml

@@ -23,8 +23,8 @@ license-headers:
     put-after: ["^{-#"]
     put-before: ["^module"]
     margin-top-code: 1
-    margin-bottom-code: 1
-    margin-bottom-file: 1
+    line-comment:
+      prefixed-by: ^--
 
 post-process:
   update-copyright:

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 - [#87] FIXED: Misleading error message when YAML syntax of .headroom.yaml is invalid
 - [#88] Add support for _Python_
 - [#89] Support GHC 9.2
+- [#92] Switch to fourmolu source code formatter
 - [#93] FIXED: Haddock module header detection is faulty
 - Bump _LTS Haskell_ to `19.9`
 

Makefile

@@ -23,12 +23,9 @@ microsite:
 
 .PHONY: pretty
 pretty: 
-	find ./app -name '*.hs' | xargs stylish-haskell -i -v
-	find ./src -name '*.hs' | xargs stylish-haskell -i -v
-	find ./test -name '*.hs' | xargs stylish-haskell -i -v
-	find ./app -name '*.hs' | xargs brittany --write-mode=inplace
-	find ./src -name '*.hs' | xargs brittany --write-mode=inplace
-	find ./test -name '*.hs' | xargs brittany --write-mode=inplace
+	find ./app -name '*.hs' | xargs fourmolu -i
+	find ./src -name '*.hs' | xargs fourmolu -i
+	find ./test -name '*.hs' | xargs fourmolu -i
 
 .PHONY: fresh
 fresh: clean build

app/Main.hs

@@ -1,55 +1,54 @@
-{-# LANGUAGE LambdaCase        #-}
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
-
-{-|
-Module      : Main
-Description : Main application launcher
-Copyright   : (c) 2019-2022 Vaclav Svejcar
-License     : BSD-3-Clause
-Maintainer  : [email protected]
-Stability   : experimental
-Portability : POSIX
-
-Code responsible for booting up the application and parsing command line
-arguments.
--}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 
+-- |
+-- Module      : Main
+-- Description : Main application launcher
+-- Copyright   : (c) 2019-2022 Vaclav Svejcar
+-- License     : BSD-3-Clause
+-- Maintainer  : [email protected]
+-- Stability   : experimental
+-- Portability : POSIX
+--
+-- Code responsible for booting up the application and parsing command line
+-- arguments.
 module Main where
 
-import           Headroom.Command                    ( commandParser )
-import           Headroom.Command.Gen                ( commandGen
-                                                     , parseGenMode
-                                                     )
-import           Headroom.Command.Init               ( commandInit )
-import           Headroom.Command.Run                ( commandRun )
-import           Headroom.Command.Types              ( Command(..)
-                                                     , CommandGenOptions(..)
-                                                     , CommandInitOptions(..)
-                                                     , CommandRunOptions(..)
-                                                     )
-import           Headroom.Types                      ( HeadroomError(..) )
-import           Options.Applicative                 ( execParser )
-import           RIO
-import           System.IO                           ( hPutStrLn )
-
+import Headroom.Command (commandParser)
+import Headroom.Command.Gen (
+    commandGen
+    , parseGenMode
+ )
+import Headroom.Command.Init (commandInit)
+import Headroom.Command.Run (commandRun)
+import Headroom.Command.Types (
+    Command (..)
+    , CommandGenOptions (..)
+    , CommandInitOptions (..)
+    , CommandRunOptions (..)
+ )
+import Headroom.Types (HeadroomError (..))
+import Options.Applicative (execParser)
+import RIO
+import System.IO (hPutStrLn)
 
 main :: IO ()
 main = do
-  command' <- execParser commandParser
-  catch
-    (bootstrap command')
-    (\ex -> do
-      hPutStrLn stderr $ "ERROR: " <> displayException (ex :: HeadroomError)
-      exitWith $ ExitFailure 1
-    )
+    command' <- execParser commandParser
+    catch
+        (bootstrap command')
+        ( \ex -> do
+            hPutStrLn stderr $ "ERROR: " <> displayException (ex :: HeadroomError)
+            exitWith $ ExitFailure 1
+        )
 
 bootstrap :: Command -> IO ()
 bootstrap = \case
-  c@(Gen _ _) -> do
-    cgoGenMode <- parseGenMode c
-    commandGen CommandGenOptions { .. }
-  Init cioLicenseType cioSourcePaths -> commandInit CommandInitOptions { .. }
-  Run croSourcePaths croExcludedPaths croExcludeIgnoredPaths croBuiltInTemplates croTemplateRefs croVariables croRunMode croDebug croDryRun
-    -> commandRun CommandRunOptions { .. }
+    c@(Gen _ _) -> do
+        cgoGenMode <- parseGenMode c
+        commandGen CommandGenOptions{..}
+    Init cioLicenseType cioSourcePaths -> commandInit CommandInitOptions{..}
+    Run croSourcePaths croExcludedPaths croExcludeIgnoredPaths croBuiltInTemplates croTemplateRefs croVariables croRunMode croDebug croDryRun ->
+        commandRun CommandRunOptions{..}

doc/templates/haskell.mustache

@@ -1,11 +1,10 @@
-{-|
-Module      : {{{ _haskell_module_name }}}
-Description : {{{ _haskell_module_shortdesc }}}
-Copyright   : (c) {{ year }} {{ author }}
-License     : {{ license }}
-Maintainer  : {{ email }}
-Stability   : experimental
-Portability : POSIX
-
-{{{ _haskell_module_longdesc }}}
--}
+-- |
+-- Module      : {{{ _haskell_module_name }}}
+-- Description : {{{ _haskell_module_shortdesc }}}
+-- Copyright   : (c) {{ year }} {{ author }}
+-- License     : {{ license }}
+-- Maintainer  : {{ email }}
+-- Stability   : experimental
+-- Portability : POSIX
+--
+-- {{{ _haskell_module_longdesc }}}

fourmolu.yaml

@@ -0,0 +1,3 @@
+comma-style: leading
+haddock-style: single-line
+import-export-comma-style: leading