GHC 9.8 support (#471)

Author: michaelpj

.github/workflows/cabal.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        ghc: ["9.2", "9.4", "9.6"]
+        ghc: ["9.4", "9.6", "9.8"]
       fail-fast: false
 
     steps:

lib/Language/Haskell/Stylish/Printer.hs

@@ -239,7 +239,7 @@ putType ltp = case GHC.unLoc ltp of
     putOutputable ltp
   GHC.HsQualTy {} ->
     putOutputable ltp
-  GHC.HsAppKindTy _ _ _ ->
+  GHC.HsAppKindTy _ _ _ _ ->
     putOutputable ltp
   GHC.HsListTy _ _ ->
     putOutputable ltp

lib/Language/Haskell/Stylish/Step/Data.hs

@@ -313,10 +313,10 @@ putName decl@MkDataDecl{..} =
     maybePutKindSig
 
   where
-    firstTvar :: Maybe (GHC.LHsTyVarBndr () GHC.GhcPs)
+    firstTvar :: Maybe (GHC.LHsTyVarBndr (GHC.HsBndrVis GHC.GhcPs) GHC.GhcPs)
     firstTvar = listToMaybe $ GHC.hsq_explicit dataTypeVars
 
-    secondTvar :: Maybe (GHC.LHsTyVarBndr () GHC.GhcPs)
+    secondTvar :: Maybe (GHC.LHsTyVarBndr (GHC.HsBndrVis GHC.GhcPs) GHC.GhcPs)
     secondTvar = listToMaybe . drop 1 $ GHC.hsq_explicit dataTypeVars
 
     maybePutKindSig :: Printer ()

lib/Language/Haskell/Stylish/Step/Imports.hs

@@ -594,8 +594,8 @@ importModuleNameLength imp =
 --------------------------------------------------------------------------------
 stringLiteral :: GHC.StringLiteral -> String
 stringLiteral sl = case GHC.sl_st sl of
-    GHC.NoSourceText -> show . GHC.unpackFS $ GHC.sl_fs sl
-    GHC.SourceText s -> s
+    GHC.NoSourceText -> GHC.unpackFS $ GHC.sl_fs sl
+    GHC.SourceText s -> GHC.unpackFS $ s
 
 
 --------------------------------------------------------------------------------

stack.yaml

@@ -1,11 +1,11 @@
-resolver: nightly-2023-06-23
+resolver: nightly-2024-01-05
 
 extra-deps:
-  - ghc-lib-parser-9.6.2.20230523
-  - ghc-lib-parser-ex-9.6.0.0
+  - ghc-lib-parser-9.8.1.20231121
+  - ghc-lib-parser-ex-9.8.0.0
   - test-framework-0.8.2.0
   - test-framework-hunit-0.3.0.2
   - ansi-wl-pprint-0.6.9
 
 save-hackage-creds: false
-compiler: ghc-9.6.1
+compiler: ghc-9.8.1

stylish-haskell.cabal

@@ -34,9 +34,9 @@ Common depends
   Default-language: Haskell2010
 
   Build-depends:
-    aeson             >= 0.6    && < 2.2,
+    aeson             >= 0.6    && < 2.3,
     base              >= 4.8    && < 5,
-    bytestring        >= 0.9    && < 0.12,
+    bytestring        >= 0.9    && < 0.13,
     Cabal             >= 3.4    && < 4.0,
     containers        >= 0.3    && < 0.7,
     directory         >= 1.2.3  && < 1.4,
@@ -45,7 +45,7 @@ Common depends
     mtl               >= 2.0    && < 2.4,
     regex-tdfa        >= 1.3    && < 1.4,
     syb               >= 0.3    && < 0.8,
-    text              >= 1.2    && < 2.1,
+    text              >= 1.2    && < 2.2,
     HsYAML-aeson      >=0.2.0   && < 0.3,
     HsYAML            >=0.2.0   && < 0.3,
 
@@ -57,17 +57,17 @@ Common depends
   -- and we have a new enough GHC. Note that 
   -- this will only work if the user's 
   -- compiler is of the matching major version!
-  if !flag(ghc-lib) && impl(ghc >= 9.6) && impl(ghc < 9.7)
+  if !flag(ghc-lib) && impl(ghc >= 9.8) && impl(ghc < 9.9)
     Build-depends:
-      ghc >= 9.6 && < 9.7,
+      ghc >= 9.8 && < 9.9,
       ghc-boot,
       ghc-boot-th
   else
     Build-depends:
-      ghc-lib-parser >= 9.6 && < 9.7
+      ghc-lib-parser >= 9.8 && < 9.9
 
   Build-depends:
-    ghc-lib-parser-ex >= 9.6 && < 9.7
+    ghc-lib-parser-ex >= 9.8 && < 9.9
 
 Library
   Import:         depends

tests/Language/Haskell/Stylish/Step/LanguagePragmas/Tests.hs

@@ -61,10 +61,12 @@ case02 = assertSnippet
     (step (Just 80) Vertical True True lANG)
     [ "{-# LANGUAGE BangPatterns #-}"
     , "{-# LANGUAGE ViewPatterns #-}"
+    , "module Main where"
     , "increment ((+ 1) -> x) = x"
     ]
 
     [ "{-# LANGUAGE ViewPatterns #-}"
+    , "module Main where"
     , "increment ((+ 1) -> x) = x"
     ]
 
@@ -75,10 +77,12 @@ case03 = assertSnippet
     (step (Just 80) Vertical True True lANG)
     [ "{-# LANGUAGE BangPatterns #-}"
     , "{-# LANGUAGE ViewPatterns #-}"
+    , "module Main where"
     , "increment x = case x of !_ -> x + 1"
     ]
 
     [ "{-# LANGUAGE BangPatterns #-}"
+    , "module Main where"
     , "increment x = case x of !_ -> x + 1"
     ]
 
@@ -226,6 +230,7 @@ case13 = assertSnippet
     input =
         [ "{-# LANGUAGE BangPatterns  #-}"
         , "{-# LANGUAGE DeriveFunctor #-}"
+        , "module Main where"
         , "main = let !x = 1 + 1 in print x"
         ]