Remove stylish haskell. Use only fourmolu for formatting.

.git-blame-ignore-revs

@@ -1,3 +1,4 @@
 9d1fd093071278be77428dba189d958d5b7a7aeb
 ddeefdf97d635634083ea286af05c1026d4bc28b
 cdd0ead52f740eca8cedb152307992a11c6b478a
+197f6f2caeaa9ca409ca13a61faae917731ada7f

.github/workflows/check-formatting.yml

@@ -41,11 +41,7 @@ jobs:
 
           for x in $(git ls-tree --full-tree --name-only -r HEAD); do
             if [ "${x##*.}" == "hs" ]; then
-              if grep -qE '^#' "$x"; then
-                echo "$x contains CPP.  Skipping."
-              else
-                "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
-              fi
+              "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
             fi
           done
 
@@ -58,11 +54,7 @@ jobs:
           git fetch origin ${{ github.base_ref }} --unshallow
           for x in $(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}..HEAD); do
             if [ "${x##*.}" == "hs" ]; then
-              if grep -qE '^#' "$x"; then
-                echo "$x contains CPP.  Skipping."
-              else
-                "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
-              fi
+              "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
             fi
           done
 

cardano-cli/cardano-cli.cabal

@@ -20,7 +20,10 @@ extra-source-files: README.md
 
 common project-config
   default-language: Haskell2010
-  default-extensions: OverloadedStrings
+  default-extensions:
+    ImportQualifiedPost
+    OverloadedStrings
+
   build-depends: base >=4.14 && <4.21
   ghc-options:
     -Wall

cardano-cli/src/Cardano/CLI/Byron/Commands.hs

@@ -11,15 +11,15 @@ module Cardano.CLI.Byron.Commands
   )
 where
 
-import           Cardano.Api hiding (GenesisParameters)
-import qualified Cardano.Api.Byron as Byron
+import Cardano.Api hiding (GenesisParameters)
+import Cardano.Api.Byron qualified as Byron
 
-import           Cardano.CLI.Byron.Genesis
-import           Cardano.CLI.Byron.Key
-import           Cardano.CLI.Byron.Tx
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Byron.Genesis
+import Cardano.CLI.Byron.Key
+import Cardano.CLI.Byron.Tx
+import Cardano.CLI.Types.Common
 
-import           Data.String (IsString)
+import Data.String (IsString)
 
 data ByronCommand
   = --- Node Related Commands ---

cardano-cli/src/Cardano/CLI/Byron/Delegation.hs

@@ -13,24 +13,24 @@ module Cardano.CLI.Byron.Delegation
   )
 where
 
-import           Cardano.Api.Byron (ACertificate (delegateVK))
-import           Cardano.Api.Byron hiding (delegateVK)
-import qualified Cardano.Api.Ledger as L
-
-import           Cardano.CLI.Byron.Key (ByronKeyFailure, renderByronKeyFailure)
-import           Cardano.CLI.Types.Common (CertificateFile (..))
-import           Cardano.Crypto (ProtocolMagicId)
-import qualified Cardano.Crypto as Crypto
-import           Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
-
-import           Prelude hiding ((.))
-
-import           Control.Category
-import           Control.Monad (unless)
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Lazy as LB
-import           Data.Text (Text)
-import           Formatting (Format, sformat)
+import Cardano.Api.Byron (ACertificate (delegateVK))
+import Cardano.Api.Byron hiding (delegateVK)
+import Cardano.Api.Ledger qualified as L
+
+import Cardano.CLI.Byron.Key (ByronKeyFailure, renderByronKeyFailure)
+import Cardano.CLI.Types.Common (CertificateFile (..))
+import Cardano.Crypto (ProtocolMagicId)
+import Cardano.Crypto qualified as Crypto
+import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
+
+import Prelude hiding ((.))
+
+import Control.Category
+import Control.Monad (unless)
+import Data.ByteString (ByteString)
+import Data.ByteString.Lazy qualified as LB
+import Data.Text (Text)
+import Formatting (Format, sformat)
 
 data ByronDelegationError
   = CertificateValidationErrors !FilePath ![Text]

cardano-cli/src/Cardano/CLI/Byron/Genesis.hs

@@ -12,33 +12,37 @@ module Cardano.CLI.Byron.Genesis
   )
 where
 
-import           Cardano.Api (Doc, Key (..), NetworkId, pretty, pshow, writeSecrets)
-import           Cardano.Api.Byron (ByronKey, SerialiseAsRawBytes (..), SigningKey (..),
-                   toByronRequiresNetworkMagic)
-import qualified Cardano.Api.Byron as Byron
-
-import           Cardano.CLI.Byron.Delegation
-import           Cardano.CLI.Byron.Key
-import           Cardano.CLI.Types.Common (GenesisFile (..))
-import qualified Cardano.Crypto as Crypto
-import           Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
-
-import           Control.Monad.IO.Class
-import           Control.Monad.Trans (MonadTrans (..))
-import           Control.Monad.Trans.Except (ExceptT (..), withExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, left, right)
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Lazy as LB
-import qualified Data.List as List
-import qualified Data.Map.Strict as Map
-import           Data.String (IsString)
-import           Data.Text (Text)
-import qualified Data.Text.Encoding as Text
-import           Data.Text.Lazy (toStrict)
-import           Data.Text.Lazy.Builder (toLazyText)
-import           Data.Time (UTCTime)
-import           Formatting.Buildable
-import           System.Directory (createDirectory, doesPathExist)
+import Cardano.Api (Doc, Key (..), NetworkId, pretty, pshow, writeSecrets)
+import Cardano.Api.Byron
+  ( ByronKey
+  , SerialiseAsRawBytes (..)
+  , SigningKey (..)
+  , toByronRequiresNetworkMagic
+  )
+import Cardano.Api.Byron qualified as Byron
+
+import Cardano.CLI.Byron.Delegation
+import Cardano.CLI.Byron.Key
+import Cardano.CLI.Types.Common (GenesisFile (..))
+import Cardano.Crypto qualified as Crypto
+import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
+
+import Control.Monad.IO.Class
+import Control.Monad.Trans (MonadTrans (..))
+import Control.Monad.Trans.Except (ExceptT (..), withExceptT)
+import Control.Monad.Trans.Except.Extra (firstExceptT, left, right)
+import Data.ByteString (ByteString)
+import Data.ByteString.Lazy qualified as LB
+import Data.List qualified as List
+import Data.Map.Strict qualified as Map
+import Data.String (IsString)
+import Data.Text (Text)
+import Data.Text.Encoding qualified as Text
+import Data.Text.Lazy (toStrict)
+import Data.Text.Lazy.Builder (toLazyText)
+import Data.Time (UTCTime)
+import Formatting.Buildable
+import System.Directory (createDirectory, doesPathExist)
 
 data ByronGenesisError
   = ByronDelegationCertSerializationError !ByronDelegationError

cardano-cli/src/Cardano/CLI/Byron/Key.hs

@@ -16,18 +16,18 @@ module Cardano.CLI.Byron.Key
   )
 where
 
-import           Cardano.Api.Byron
+import Cardano.Api.Byron
 
-import           Cardano.CLI.Types.Common
-import qualified Cardano.Crypto.Signing as Crypto
+import Cardano.CLI.Types.Common
+import Cardano.Crypto.Signing qualified as Crypto
 
-import           Control.Exception (Exception (..))
-import qualified Data.ByteString as SB
-import qualified Data.ByteString.UTF8 as UTF8
-import           Data.String (IsString, fromString)
-import           Data.Text (Text)
-import qualified Data.Text as T
-import           Formatting (build, sformat, (%))
+import Control.Exception (Exception (..))
+import Data.ByteString qualified as SB
+import Data.ByteString.UTF8 qualified as UTF8
+import Data.String (IsString, fromString)
+import Data.Text (Text)
+import Data.Text qualified as T
+import Formatting (build, sformat, (%))
 
 data ByronKeyFailure
   = ReadSigningKeyFailure !FilePath !Text

cardano-cli/src/Cardano/CLI/Byron/Legacy.hs

@@ -10,16 +10,16 @@ module Cardano.CLI.Byron.Legacy
   )
 where
 
-import           Cardano.Api (textShow)
+import Cardano.Api (textShow)
 
-import           Cardano.Crypto.Signing (SigningKey (..))
-import qualified Cardano.Crypto.Wallet as Wallet
+import Cardano.Crypto.Signing (SigningKey (..))
+import Cardano.Crypto.Wallet qualified as Wallet
 
-import qualified Codec.CBOR.Decoding as D
-import qualified Codec.CBOR.Encoding as E
-import           Control.Monad (when)
-import           Data.Text (Text)
-import           Formatting (build, formatToString)
+import Codec.CBOR.Decoding qualified as D
+import Codec.CBOR.Encoding qualified as E
+import Control.Monad (when)
+import Data.Text (Text)
+import Formatting (build, formatToString)
 
 -- | LegacyDelegateKey is a subset of the UserSecret's from the legacy codebase:
 -- 1. the VSS keypair must be present