hls-gadt-plugin fixes

Author: wz1000

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

@@ -213,10 +213,7 @@ prettyGADTDecl df decl =
             { tcdDExt = adjustWhere tcdDExt
             , tcdDataDefn = tcdDataDefn
                 { dd_cons =
-#if MIN_VERSION_ghc(9,5,0)
-                    DataTypeCons False $
-#endif
-                      map adjustCon (extract_cons $ dd_cons tcdDataDefn)
+                      fmap adjustCon (dd_cons tcdDataDefn)
                 }
             , ..
             }

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 (`elem`[GHC92, GHC94]) "Single deriving has different output on ghc9.2+" $
+    , onlyWorkForGhcVersions (`elem`[GHC92, GHC94, GHC96]) "Single deriving has different output on ghc9.2+" $
         runTest "SingleDerivingGHC92" "SingleDerivingGHC92" 2 0 3 14
-    , knownBrokenForGhcVersions [GHC92,GHC94] "Single deriving has different output on ghc9.2+" $
+    , knownBrokenForGhcVersions [GHC92,GHC94,GHC96] "Single deriving has different output on ghc9.2+" $
         runTest "SingleDeriving" "SingleDeriving" 2 0 3 14
-    , onlyWorkForGhcVersions (`elem`[GHC92, GHC94]) "only ghc-9.2+ enabled GADTs pragma implicitly" $
+    , onlyWorkForGhcVersions (`elem`[GHC92, GHC94, GHC96]) "only ghc-9.2+ enabled GADTs pragma implicitly" $
         gadtPragmaTest "ghc-9.2 don't need to insert GADTs pragma" False
-    , knownBrokenForGhcVersions [GHC92,GHC94] "ghc-9.2 has enabled GADTs pragma implicitly" $
+    , knownBrokenForGhcVersions [GHC92,GHC94,GHC96] "ghc-9.2 has enabled GADTs pragma implicitly" $
         gadtPragmaTest "insert pragma" True
     ]