restyled-io · pbrisbin · Jan 24, 2025 · Jan 24, 2025 · Jan 24, 2025 · Jan 24, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,9 +14,12 @@ jobs:
       - uses: actions/checkout@v4
       - id: stack
         uses: freckle/stack-action@v5
-      - uses: freckle/weeder-action@v2
-        with:
-          ghc-version: ${{ steps.stack.outputs.compiler-version }}
+
+      # https://github.com/ocharles/weeder/issues/190
+      # - uses: freckle/weeder-action@v2
+      #   with:
+      #     ghc-version: ${{ steps.stack.outputs.compiler-version }}
+
       - uses: extractions/setup-just@v2
       - run: just dist
       - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,6 +38,9 @@ jobs:
     needs: [build]
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
       - uses: actions/download-artifact@v4
 
       - id: token
@@ -51,13 +54,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
 
-      # - if: ${{ steps.release.outputs.new_release_published == 'true' }}
-      #   run: |
-      #     gh release upload "$TAG" ./*-binaries/restyler-*.tar.gz
-      #   env:
-      #     TAG: ${{ steps.release.outputs.new_release_git_tag }}
-      #     GH_TOKEN: ${{ github.token }}
-
   docs:
     needs: [build]
     environment:
@@ -83,8 +79,10 @@ jobs:
           mkdir -p ./bin
           sudo mv -v restyler-*/restyle /usr/local/bin
 
-      # TODO: only checkout doc folder
       - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            doc
 
       - name: Generate ronn documenation
         run: |

diff --git a/app/Main.hs b/app/Main.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Main
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/fourmolu.yaml b/fourmolu.yaml
@@ -1,15 +1,28 @@
 indentation: 2
-column-limit: 80 # ignored until v12 / ghc-9.6
+column-limit: 80
 function-arrows: leading
 comma-style: leading # default
 import-export-style: leading
+import-grouping:
+  - name: "Preludes"
+    rules:
+      - glob: Prelude
+      - glob: Restyler.Prelude
+  - name: "Everything else"
+    rules:
+      - match: all
+        priority: 100
 indent-wheres: false # default
 record-brace-space: true
 newlines-between-decls: 1 # default
 haddock-style: single-line
 let-style: mixed
 in-style: left-align
-single-constraint-parens: never # ignored until v12 / ghc-9.6
+single-constraint-parens: never
+sort-constraints: true
+sort-derived-classes: true
+sort-derived-clauses: true
+trailing-section-operators: false
 unicode: never # default
 respectful: true # default
 fixities: [] # default
diff --git a/package.yaml b/package.yaml
@@ -29,6 +29,8 @@ ghc-options:
   - -Wno-missed-specialisations
   - -Wno-missing-import-lists
   - -Wno-missing-kind-signatures
+  - -Wno-missing-poly-kind-signatures
+  - -Wno-missing-role-annotations
   - -Wno-missing-safe-haskell-mode
   - -Wno-prepositive-qualified-module
   - -Wno-unsafe

diff --git a/restyler.cabal b/restyler.cabal
@@ -74,7 +74,7 @@ library
       OverloadedStrings
       QuasiQuotes
       TypeFamilies
-  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe
+  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-poly-kind-signatures -Wno-missing-role-annotations -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe
   build-depends:
       Blammo
     , Glob
@@ -134,7 +134,7 @@ executable restyle
       OverloadedStrings
       QuasiQuotes
       TypeFamilies
-  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe -Wall -threaded -rtsopts -with-rtsopts=-N
+  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-poly-kind-signatures -Wno-missing-role-annotations -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe -Wall -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       aeson
     , base
@@ -178,7 +178,7 @@ test-suite test
       OverloadedStrings
       QuasiQuotes
       TypeFamilies
-  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe
+  ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missed-specialisations -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-poly-kind-signatures -Wno-missing-role-annotations -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-unsafe
   build-depends:
       Blammo
     , aeson

diff --git a/src/Restyler/AnnotatedException.hs b/src/Restyler/AnnotatedException.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.AnnotatedException
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental
@@ -40,11 +40,11 @@ suppressWith :: MonadUnliftIO m => a -> m a -> m a
 suppressWith x = either (const $ pure x) pure <=< tryAnnotated @SomeException
 
 -- | Log any exception and return '()'
-suppressWarn :: (MonadUnliftIO m, MonadLogger m) => m () -> m ()
+suppressWarn :: (MonadLogger m, MonadUnliftIO m) => m () -> m ()
 suppressWarn = suppressWarnWith ()
 
 -- | Log any exception and return the given @a@
-suppressWarnWith :: (MonadUnliftIO m, MonadLogger m) => a -> m a -> m a
+suppressWarnWith :: (MonadLogger m, MonadUnliftIO m) => a -> m a -> m a
 suppressWarnWith x = either warn pure <=< tryAnnotated @SomeException
  where
   warn ex = do

diff --git a/src/Restyler/App.hs b/src/Restyler/App.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.App
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental
@@ -28,15 +28,15 @@ newtype AppT app m a = AppT
   { unwrap :: ReaderT app m a
   }
   deriving newtype
-    ( Functor
-    , Applicative
+    ( Applicative
+    , Functor
     , Monad
-    , MonadThrow
     , MonadCatch
-    , MonadMask
     , MonadIO
-    , MonadUnliftIO
+    , MonadMask
     , MonadReader app
+    , MonadThrow
+    , MonadUnliftIO
     )
   deriving (MonadLogger, MonadLoggerIO) via (WithLogger app m)
   deriving (MonadDirectory) via (ActualDirectory (AppT app m))

diff --git a/src/Restyler/CLI.hs b/src/Restyler/CLI.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.CLI
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental
@@ -18,7 +18,7 @@ import Restyler.Config.FailOnDifferences
 import Restyler.RestyleResult
 
 main
-  :: (HasLogger app, HasFailOnDifferences app)
+  :: (HasFailOnDifferences app, HasLogger app)
   => (forall a. (app -> IO a) -> IO a)
   -> AppT app IO RestyleResult
   -> IO ()

diff --git a/src/Restyler/Config.hs b/src/Restyler/Config.hs
@@ -4,7 +4,7 @@
 -- | Handling of @.restyled.yaml@ content and behavior driven there-by
 --
 -- Module      : Restyler.Config
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/CommitTemplate.hs b/src/Restyler/Config/CommitTemplate.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.CommitTemplate
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental
@@ -27,7 +27,7 @@ newtype CommitTemplate = CommitTemplate
   { unwrap :: Text
   }
   deriving stock (Eq)
-  deriving newtype (Show, IsString, HasCodec)
+  deriving newtype (HasCodec, IsString, Show)
 
 commitTemplateParser :: Parser CommitTemplate
 commitTemplateParser =

diff --git a/src/Restyler/Config/DryRun.hs b/src/Restyler/Config/DryRun.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.DryRun
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/Enabled.hs b/src/Restyler/Config/Enabled.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.Enabled
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/Exclude.hs b/src/Restyler/Config/Exclude.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.Exclude
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/FailOnDifferences.hs b/src/Restyler/Config/FailOnDifferences.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.FailOnDifferences
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/Glob.hs b/src/Restyler/Config/Glob.hs
@@ -3,7 +3,7 @@
 -- | Small wrapper over @'System.FilePath.Glob.Pattern'@
 --
 -- Module      : Restyler.Config.Glob
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental
@@ -24,7 +24,7 @@ import System.FilePath.Glob qualified as Glob
 
 newtype Glob a = Glob {unwrap :: String}
   deriving stock (Eq)
-  deriving newtype (Show, IsString, HasCodec)
+  deriving newtype (HasCodec, IsString, Show)
 
 class GlobTarget a where
   forMatch :: a -> String

diff --git a/src/Restyler/Config/HostDirectory.hs b/src/Restyler/Config/HostDirectory.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.HostDirectory
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/Ignore.hs b/src/Restyler/Config/Ignore.hs
@@ -3,7 +3,7 @@
 -- |
 --
 -- Module      : Restyler.Config.Ignore
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/Image.hs b/src/Restyler/Config/Image.hs
@@ -3,7 +3,7 @@
 -- |
 --
 -- Module      : Restyler.Config.Image
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental
@@ -26,7 +26,7 @@ data Image = Image
   , name :: Maybe (First Text)
   , tag :: Maybe (First Text)
   }
-  deriving stock (Eq, Show, Generic)
+  deriving stock (Eq, Generic, Show)
   deriving (Semigroup) via (GenericSemigroupMonoid Image)
   deriving (FromJSON, ToJSON) via (Autodocodec Image)
 

diff --git a/src/Restyler/Config/ImageCleanup.hs b/src/Restyler/Config/ImageCleanup.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.ImageCleanup
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/Include.hs b/src/Restyler/Config/Include.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.Include
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/Interpreter.hs b/src/Restyler/Config/Interpreter.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.Interpreter
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/LogSettings.hs b/src/Restyler/Config/LogSettings.hs
@@ -3,7 +3,7 @@
 -- |
 --
 -- Module      : Restyler.Config.LogSettings
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental
@@ -36,12 +36,12 @@ instance HasCodec LogColor where
 newtype Mod a = Mod
   { appMod :: a -> a
   }
-  deriving (Semigroup, Monoid) via (Dual (Endo a))
+  deriving (Monoid, Semigroup) via (Dual (Endo a))
 
 newtype LogSettingsOption = LogSettingsOption
   { unwrap :: Mod LogSettings
   }
-  deriving newtype (Semigroup, Monoid)
+  deriving newtype (Monoid, Semigroup)
 
 getLogSettings :: LogSettingsOption -> IO LogSettings
 getLogSettings settings = modLogSettings settings <$> LogSettings.parse
@@ -90,8 +90,8 @@ colorParser =
     . Mod
     . setLogSettingsColor
     <$> withShownDefault
+      (const "auto")
       LogColorAuto
-      "auto"
       ( setting
           [ help "Enable color WHEN"
           , option

diff --git a/src/Restyler/Config/Manifest.hs b/src/Restyler/Config/Manifest.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.Manifest
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental

diff --git a/src/Restyler/Config/NoClean.hs b/src/Restyler/Config/NoClean.hs
@@ -1,7 +1,7 @@
 -- |
 --
 -- Module      : Restyler.Config.NoClean
--- Copyright   : (c) 2024 Patrick Brisbin
+-- Copyright   : (c) 2025 Patrick Brisbin
 -- License     : AGPL-3
 -- Maintainer  : [email protected]
 -- Stability   : experimental