Merge pull request #756 from IntersectMBO/mgalazyn/chore/remove-styli…

…sh-haskell Remove stylish haskell. Use only fourmolu for formatting.
IntersectMBO · Feb 18, 2025 · 7b54ab3 · 7b54ab3
2 parents 5858356 + 2ea79c0
commit 7b54ab3
Show file tree

Hide file tree

Showing 154 changed files with 3,362 additions and 3,094 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -2,3 +2,4 @@ e28fadbebc18b87991f84af72d8611393ae8875a
 b76f949e815990545371530a466b16f691a3aa98
 73fd9122f78282b1db7f6884b3bc23fb29f3e67f
 7634a9e8235050a55e5e3022a22a550aa3ade06e
+1bb9b9baf0aa9bf610df7fb8fcad193563469eb3
diff --git a/.github/workflows/check-formatting.yml b/.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
 

diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml
diff --git a/cardano-api-gen/src/Test/Gen/Cardano/Api/Empty.hs b/cardano-api-gen/src/Test/Gen/Cardano/Api/Empty.hs
@@ -1,5 +1,5 @@
 module Test.Gen.Cardano.Api.Empty where
 
-import           Test.Gen.Cardano.Api ()
+import Test.Gen.Cardano.Api ()
 
 -- | This module is empty, but it is needed to prevent unused-packages warning
diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -22,7 +22,10 @@ extra-doc-files:
 
 common project-config
   default-language: Haskell2010
-  default-extensions: OverloadedStrings
+  default-extensions:
+    ImportQualifiedPost
+    OverloadedStrings
+
   build-depends: base >=4.14 && <4.21
   ghc-options:
     -Wall

diff --git a/cardano-api/gen/Test/Gen/Cardano/Api.hs b/cardano-api/gen/Test/Gen/Cardano/Api.hs
@@ -9,24 +9,24 @@ module Test.Gen.Cardano.Api
   )
 where
 
-import qualified Cardano.Ledger.Alonzo.Core as Ledger
-import qualified Cardano.Ledger.Alonzo.Genesis as Alonzo
-import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
-import qualified Cardano.Ledger.BaseTypes as Ledger
-import qualified Cardano.Ledger.Coin as Ledger
-import qualified Cardano.Ledger.Plutus.CostModels as Plutus
-import qualified Cardano.Ledger.Plutus.Language as Alonzo
-import           Cardano.Ledger.Shelley.TxAuxData (Metadatum (..), ShelleyTxAuxData (..))
-
-import qualified Data.Map.Strict as Map
-import           Data.Word (Word64)
-import           GHC.Exts (IsList (..))
-
-import           Test.Gen.Cardano.Api.Typed (genCostModel, genRational)
-
-import           Hedgehog (Gen, Range)
-import qualified Hedgehog.Gen as Gen
-import qualified Hedgehog.Internal.Range as Range
+import Cardano.Ledger.Alonzo.Core qualified as Ledger
+import Cardano.Ledger.Alonzo.Genesis qualified as Alonzo
+import Cardano.Ledger.Alonzo.Scripts qualified as Alonzo
+import Cardano.Ledger.BaseTypes qualified as Ledger
+import Cardano.Ledger.Coin qualified as Ledger
+import Cardano.Ledger.Plutus.CostModels qualified as Plutus
+import Cardano.Ledger.Plutus.Language qualified as Alonzo
+import Cardano.Ledger.Shelley.TxAuxData (Metadatum (..), ShelleyTxAuxData (..))
+
+import Data.Map.Strict qualified as Map
+import Data.Word (Word64)
+import GHC.Exts (IsList (..))
+
+import Test.Gen.Cardano.Api.Typed (genCostModel, genRational)
+
+import Hedgehog (Gen, Range)
+import Hedgehog.Gen qualified as Gen
+import Hedgehog.Internal.Range qualified as Range
 
 genMetadata :: Ledger.Era era => Gen (ShelleyTxAuxData era)
 genMetadata = do

diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Byron.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Byron.hs
@@ -7,17 +7,17 @@ module Test.Gen.Cardano.Api.Byron
   )
 where
 
-import           Cardano.Api hiding (txIns)
-import           Cardano.Api.Byron
+import Cardano.Api hiding (txIns)
+import Cardano.Api.Byron
 
-import           Data.Proxy
+import Data.Proxy
 
-import           Test.Gen.Cardano.Api.Typed
+import Test.Gen.Cardano.Api.Typed
 
-import           Hedgehog
-import           Test.Hedgehog.Roundtrip.CBOR
-import           Test.Tasty
-import           Test.Tasty.Hedgehog
+import Hedgehog
+import Test.Hedgehog.Roundtrip.CBOR
+import Test.Tasty
+import Test.Tasty.Hedgehog
 
 prop_byron_roundtrip_txbody_CBOR :: Property
 prop_byron_roundtrip_txbody_CBOR = property $ do

diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Era.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Era.hs
@@ -10,18 +10,18 @@ module Test.Gen.Cardano.Api.Era
   )
 where
 
-import           Cardano.Api hiding (txIns)
-import           Cardano.Api.Shelley
+import Cardano.Api hiding (txIns)
+import Cardano.Api.Shelley
 
-import qualified Cardano.Ledger.BaseTypes as Ledger
-import qualified Cardano.Ledger.Core as Ledger
+import Cardano.Ledger.BaseTypes qualified as Ledger
+import Cardano.Ledger.Core qualified as Ledger
 
-import qualified Data.Functor.Identity as Ledger
+import Data.Functor.Identity qualified as Ledger
 
-import           Test.Cardano.Ledger.Conway.Arbitrary ()
-import           Test.Cardano.Ledger.Core.Arbitrary ()
+import Test.Cardano.Ledger.Conway.Arbitrary ()
+import Test.Cardano.Ledger.Core.Arbitrary ()
 
-import           Test.QuickCheck (Arbitrary (..))
+import Test.QuickCheck (Arbitrary (..))
 
 shelleyBasedEraTestConstraints
   :: ()

diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Hardcoded.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Hardcoded.hs
@@ -10,11 +10,11 @@ module Test.Gen.Cardano.Api.Hardcoded
   )
 where
 
-import qualified Cardano.Binary as CBOR
+import Cardano.Binary qualified as CBOR
 
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Lazy as LBS
+import Data.ByteString (ByteString)
+import Data.ByteString qualified as BS
+import Data.ByteString.Lazy qualified as LBS
 
 exampleDoubleEncodedBytes :: LBS.ByteString
 exampleDoubleEncodedBytes = LBS.fromStrict $ CBOR.toStrictByteString exampleDoubleEncodedBytesEncoding

diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Metadata.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Metadata.hs
@@ -7,24 +7,24 @@ module Test.Gen.Cardano.Api.Metadata
   )
 where
 
-import           Cardano.Api
-
-import           Data.Aeson (ToJSON (..))
-import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.Key as Aeson
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Base16 as Base16
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Text
-import           Data.Word (Word64)
-import           GHC.Exts (IsList (..))
-
-import           Hedgehog (Gen)
-import qualified Hedgehog.Gen as Gen
-import qualified Hedgehog.Internal.Gen as Gen
-import qualified Hedgehog.Range as Range
+import Cardano.Api
+
+import Data.Aeson (ToJSON (..))
+import Data.Aeson qualified as Aeson
+import Data.Aeson.Key qualified as Aeson
+import Data.ByteString (ByteString)
+import Data.ByteString qualified as BS
+import Data.ByteString.Base16 qualified as Base16
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.Encoding qualified as Text
+import Data.Word (Word64)
+import GHC.Exts (IsList (..))
+
+import Hedgehog (Gen)
+import Hedgehog.Gen qualified as Gen
+import Hedgehog.Internal.Gen qualified as Gen
+import Hedgehog.Range qualified as Range
 
 -- ----------------------------------------------------------------------------
 -- Generators

diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/ProtocolParameters.hs b/cardano-api/gen/Test/Gen/Cardano/Api/ProtocolParameters.hs
@@ -1,17 +1,17 @@
 module Test.Gen.Cardano.Api.ProtocolParameters where
 
-import           Cardano.Api
-import           Cardano.Api.Internal.ProtocolParameters
-import           Cardano.Api.Ledger
+import Cardano.Api
+import Cardano.Api.Internal.ProtocolParameters
+import Cardano.Api.Ledger
 
-import           Test.Gen.Cardano.Api.Typed (genCostModels)
+import Test.Gen.Cardano.Api.Typed (genCostModels)
 
-import           Test.Cardano.Ledger.Alonzo.Arbitrary ()
-import           Test.Cardano.Ledger.Conway.Arbitrary ()
+import Test.Cardano.Ledger.Alonzo.Arbitrary ()
+import Test.Cardano.Ledger.Conway.Arbitrary ()
 
-import           Hedgehog (MonadGen)
-import qualified Hedgehog.Gen as Gen
-import qualified Hedgehog.Gen.QuickCheck as Q
+import Hedgehog (MonadGen)
+import Hedgehog.Gen qualified as Gen
+import Hedgehog.Gen.QuickCheck qualified as Q
 
 genStrictMaybe :: MonadGen m => m a -> m (StrictMaybe a)
 genStrictMaybe gen =

diff --git a/cardano-api/gen/Test/Gen/Cardano/Crypto/Seed.hs b/cardano-api/gen/Test/Gen/Cardano/Crypto/Seed.hs
@@ -4,15 +4,15 @@ module Test.Gen.Cardano.Crypto.Seed
   )
 where
 
-import           Cardano.Api (AsType, Key)
-import qualified Cardano.Api as API
+import Cardano.Api (AsType, Key)
+import Cardano.Api qualified as API
 
-import           Cardano.Crypto.Seed (Seed)
-import qualified Cardano.Crypto.Seed as C
+import Cardano.Crypto.Seed (Seed)
+import Cardano.Crypto.Seed qualified as C
 
-import           Hedgehog (MonadGen, Range)
-import qualified Hedgehog.Gen as G
-import qualified Hedgehog.Range as R
+import Hedgehog (MonadGen, Range)
+import Hedgehog.Gen qualified as G
+import Hedgehog.Range qualified as R
 
 genSeed :: MonadGen m => Range Int -> m Seed
 genSeed r = C.mkSeedFromBytes <$> G.bytes r