9.4 support for gadt and retrie plugins

Author: wz1000

haskell-language-server.cabal

@@ -262,7 +262,7 @@ common rename
     cpp-options: -Dhls_rename
 
 common retrie
-  if flag(retrie) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(retrie)
     build-depends: hls-retrie-plugin ^>= 1.0
     cpp-options: -Dhls_retrie
 
@@ -317,7 +317,7 @@ common changeTypeSignature
     cpp-options: -Dhls_changeTypeSignature
 
 common gadt
-  if flag(gadt) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(gadt)
     build-depends: hls-gadt-plugin ^>= 1.0
     cpp-options: -Dhls_gadt
 

plugins/hls-gadt-plugin/hls-gadt-plugin.cabal

@@ -20,10 +20,6 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
-  if impl(ghc >= 9.3)
-    buildable: False
-  else
-    buildable: True
   exposed-modules:    Ide.Plugin.GADT
   other-modules:      Ide.Plugin.GHC
 
@@ -54,10 +50,6 @@ library
   default-extensions: DataKinds
 
 test-suite tests
-  if impl(ghc >= 9.3)
-    buildable: False
-  else
-    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

plugins/hls-gadt-plugin/src/Ide/Plugin/GHC.hs

@@ -111,7 +111,12 @@ h98ToGADTConDecl dataName tyVars ctxt = \case
         renderDetails :: HsConDeclH98Details GP -> HsConDeclGADTDetails GP
         renderDetails (PrefixCon _ args)   = PrefixConGADT args
         renderDetails (InfixCon arg1 arg2) = PrefixConGADT [arg1, arg2]
+#if MIN_VERSION_ghc(9,3,0)
+        renderDetails (RecCon recs)        = RecConGADT recs noHsUniTok
+#else
         renderDetails (RecCon recs)        = RecConGADT recs
+#endif
+
 #else
         renderDetails (PrefixCon args)     = PrefixCon args
         renderDetails (InfixCon arg1 arg2) = PrefixCon [arg1, arg2]
@@ -185,7 +190,11 @@ prettyGADTDecl df decl =
         adjustTyClD = \case
                 Right (L _ (TyClD _ tycld)) -> Right $ adjustDataDecl tycld
                 Right x -> Left $ "Expect TyClD but got " <> showAst x
+#if MIN_VERSION_ghc(9,3,0)
+                Left err -> Left $ printWithoutUniques err
+#else
                 Left err -> Left $ show err
+#endif
 
         adjustDataDecl DataDecl{..} = DataDecl
             { tcdDExt = adjustWhere tcdDExt

plugins/hls-gadt-plugin/test/Main.hs

@@ -35,13 +35,13 @@ tests = testGroup "GADT"
     , runTest "ConstructorContext" "ConstructorContext" 2 0 2 38
     , runTest "Context" "Context" 2 0 4 41
     , runTest "Pragma" "Pragma" 2 0 3 29
-    , onlyWorkForGhcVersions (==GHC92) "Single deriving has different output on ghc9.2" $
+    , onlyWorkForGhcVersions (`elem`[GHC92, GHC94]) "Single deriving has different output on ghc9.2+" $
         runTest "SingleDerivingGHC92" "SingleDerivingGHC92" 2 0 3 14
-    , knownBrokenForGhcVersions [GHC92] "Single deriving has different output on ghc9.2" $
+    , knownBrokenForGhcVersions [GHC92,GHC94] "Single deriving has different output on ghc9.2+" $
         runTest "SingleDeriving" "SingleDeriving" 2 0 3 14
-    , onlyWorkForGhcVersions (==GHC92) "only ghc-9.2 enabled GADTs pragma implicitly" $
+    , onlyWorkForGhcVersions (`elem`[GHC92, GHC94]) "only ghc-9.2+ enabled GADTs pragma implicitly" $
         gadtPragmaTest "ghc-9.2 don't need to insert GADTs pragma" False
-    , knownBrokenForGhcVersions [GHC92] "ghc-9.2 has enabled GADTs pragma implicitly" $
+    , knownBrokenForGhcVersions [GHC92,GHC94] "ghc-9.2 has enabled GADTs pragma implicitly" $
         gadtPragmaTest "insert pragma" True
     ]
 

plugins/hls-retrie-plugin/hls-retrie-plugin.cabal

@@ -17,10 +17,6 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
-  if impl(ghc >= 9.3)
-    buildable: False
-  else
-    buildable: True
   exposed-modules:    Ide.Plugin.Retrie
   hs-source-dirs:     src
   build-depends:

plugins/hls-retrie-plugin/src/Ide/Plugin/Retrie.hs

@@ -96,6 +96,11 @@ import           Language.LSP.Types                   as J hiding
 import           Retrie.CPP                           (CPP (NoCPP), parseCPP)
 import           Retrie.ExactPrint                    (Annotated, fix,
                                                        transformA, unsafeMkA)
+
+#if MIN_VERSION_ghc(9,3,0)
+import GHC.Types.PkgQual
+#endif
+
 #if MIN_VERSION_ghc(9,2,0)
 import           Retrie.ExactPrint                    (makeDeltaAst)
 #else
@@ -548,7 +553,11 @@ toImportDecl AddImport {..} = GHC.ImportDecl {ideclSource = ideclSource', ..}
     ideclSource' = if ideclSource then IsBoot else NotBoot
     toMod = noLocA . GHC.mkModuleName
     ideclName = toMod ideclNameString
+#if MIN_VERSION_ghc(9,3,0)
+    ideclPkgQual = NoRawPkgQual
+#else
     ideclPkgQual = Nothing
+#endif
     ideclSafe = False
     ideclImplicit = False
     ideclHiding = Nothing