pbrisbin · pbrisbin · May 28, 2024 · May 28, 2024 · May 28, 2024 · May 28, 2024
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,6 @@
+# This file is a list of commits to be ignored in commands such as git-blame. To
+# make this work, you need to run:
+#
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+#
+###
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,51 +12,44 @@ jobs:
     strategy:
       matrix:
         stack-yaml:
-          - stack-nightly.yaml   # ghc-9.2
-          - stack.yaml           # ghc-9.0
+          - stack-nightly.yaml   # ghc-9.8
+          - stack.yaml           # ghc-9.6
+          - stack-lts-21.25.yaml # ghc-9.4
+          - stack-lts-20.26.yaml # ghc-9.2
+          - stack-lts-19.33.yaml # ghc-9.0
           - stack-lts-18.28.yaml # ghc-8.10
           - stack-lts-16.31.yaml # ghc-8.8
           - stack-lts-14.27.yaml # ghc-8.6
           - stack-lts-12.26.yaml # ghc-8.4
       fail-fast: false
 
+    env:
+      STACK_YAML: ${{ matrix.stack-yaml }}
+
     steps:
-      - uses: actions/checkout@v2
-      - uses: freckle/stack-cache-action@v1
-        with:
-          stack-yaml: ${{ matrix.stack-yaml }}
+      - uses: actions/checkout@v4
 
       - id: stack
-        uses: freckle/stack-action@v3
+        uses: freckle/stack-action@v5
         with:
-          stack-yaml: ${{ matrix.stack-yaml }}
           stack-arguments: --coverage
+          compiler-tools: hpc-lcov
 
       - if: ${{ matrix.stack-yaml == 'stack.yaml' }}
         name: Reformat coverage
-        run: |
-          tix='${{ steps.stack.outputs.local-hpc-root }}/combined/all/all.tix'
-          stack --resolver lts-18.28 --no-terminal install --copy-compiler-tool hpc-lcov
-          stack --resolver lts-18.28 --no-terminal exec -- hpc-lcov --file "$tix"
+        run: stack exec -- hpc-lcov --file '${{ steps.stack.outputs.local-hpc-root }}/combined/all/all.tix'
 
       - if: ${{ matrix.stack-yaml == 'stack.yaml' }}
         name: Upload coverage
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         with:
           files: ./lcov.info
 
-      - if: ${{ matrix.stack-yaml == 'stack.yaml' }}
-        uses: freckle/weeder-action@v1
-        with:
-          weeder-version: 2.3.0
-
   hlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: rwe/actions-hlint-setup@v1
-      - run: |
-          curl -o .hlint.yaml https://raw.githubusercontent.com/pbrisbin/dotfiles/master/hlint.yaml
-      - uses: rwe/actions-hlint-run@v2
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/hlint-setup@v2
+      - uses: haskell-actions/hlint-run@v2
         with:
           fail-on: warning
diff --git a/.restyled.yaml b/.restyled.yaml
@@ -1,12 +1,3 @@
----
 restylers:
-  - stylish-haskell:
-      include:
-        - "**/*.hs"
-        - "!src/Yesod/Paginator/Pages.hs"       # avoid DerivingStrategies
-  - brittany:
-      include:
-        - "**/*.hs"
-        - "!src/Yesod/Paginator/Pages.hs"       # avoid DerivingStrategies
-        - "!example/Main.hs"                    # HsSpliceE
-        - "!src/Yesod/Paginator/Widgets.hs"     # HsSpliceE
+  - "!stylish-haskell"
+  - fourmolu
diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml
diff --git a/Makefile b/Makefile
diff --git a/Setup.hs b/Setup.hs
@@ -1,2 +1,3 @@
 import Distribution.Simple
+
 main = defaultMain
diff --git a/brittany.yaml b/brittany.yaml
diff --git a/doctest/Main.hs b/doctest/Main.hs
@@ -1,6 +1,6 @@
 module Main
-    ( main
-    ) where
+  ( main
+  ) where
 
 import Prelude
 

diff --git a/example/Main.hs b/example/Main.hs
@@ -8,8 +8,8 @@
 {-# OPTIONS_GHC -Wno-unused-top-binds #-}
 
 module Main
-    ( main
-    ) where
+  ( main
+  ) where
 
 import Prelude
 
@@ -19,15 +19,18 @@ import Yesod.Paginator
 
 data App = App
 
-mkYesod "App" [parseRoutes|
+mkYesod
+  "App"
+  [parseRoutes|
     / RootR GET
 |]
 
 instance Yesod App where
-    approot = ApprootRelative
-    defaultLayout widget = do
-        pc <- widgetToPageContent widget
-        withUrlRenderer [hamlet|$newline never
+  approot = ApprootRelative
+  defaultLayout widget = do
+    pc <- widgetToPageContent widget
+    withUrlRenderer
+      [hamlet|$newline never
             $doctype 5
             <html lang="en">
                 <head>
@@ -43,13 +46,13 @@ instance Yesod App where
 
 getRootR :: Handler Html
 getRootR = do
-    let things' = [1 .. 1142] :: [Int]
+  let things' = [1 .. 1142] :: [Int]
 
-    pages <- paginate 3 things'
+  pages <- paginate 3 things'
 
-    defaultLayout $ do
-        setTitle "My title"
-        [whamlet|$newline never
+  defaultLayout $ do
+    setTitle "My title"
+    [whamlet|$newline never
             <h1>Pagination Examples
             <h2>The things:
             <ul>

diff --git a/fourmolu.yaml b/fourmolu.yaml
@@ -0,0 +1,17 @@
+indentation: 2
+column-limit: 80 # ignored until v12 / ghc-9.6
+function-arrows: leading
+comma-style: leading # default
+import-export-style: leading
+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
+unicode: never # default
+respectful: true # default
+fixities:
+  - "infix 4 `stringEqual`"
+  - "infixl 1 &"
diff --git a/package.yaml b/package.yaml
@@ -18,6 +18,9 @@ ghc-options:
   - -Wno-unsafe
 
 when:
+  - condition: impl(ghc >= 9.8)
+    ghc-options:
+      - -Wno-missing-role-annotations
   - condition: impl(ghc >= 9.2)
     ghc-options:
       - -Wno-missing-kind-signatures

diff --git a/src/Yesod/Paginator.hs b/src/Yesod/Paginator.hs
@@ -33,38 +33,36 @@
 --             ^{'simple' 5 pages}
 --             |]
 -- @
---
 module Yesod.Paginator
-    (
-    -- * Type-safe numerics
-      PageNumber
-    , PerPage
-    , ItemsCount
+  ( -- * Type-safe numerics
+    PageNumber
+  , PerPage
+  , ItemsCount
 
     -- * Paginated data
-    , Pages
-    , pagesCurrent
+  , Pages
+  , pagesCurrent
 
     -- * The current page
-    , Page
-    , pageItems
+  , Page
+  , pageItems
 
     -- * Paginators
-    , paginate
-    , paginateWith
-    , selectPaginated
-    , selectPaginatedWith
+  , paginate
+  , paginateWith
+  , selectPaginated
+  , selectPaginatedWith
 
     -- * Widgets
-    , simple
-    , simpleWith
-    , ellipsed
-    , ellipsedWith
+  , simple
+  , simpleWith
+  , ellipsed
+  , ellipsedWith
 
     -- * Pagination configuration
-    , PaginationConfig(..)
-    , PageParamName(..)
-    )
+  , PaginationConfig (..)
+  , PageParamName (..)
+  )
 where
 
 import Yesod.Paginator.Pages