Drop conditional glasgow_haskell cpp

Author: andys8

Diff for: ghcide/src/Development/IDE/GHC/Compat/CPP.hs

@@ -16,20 +16,20 @@ module Development.IDE.GHC.Compat.CPP (
     doCpp
     ) where
 
-import           FileCleanup
-import           Packages
-import           Panic
-import           SysTools
-import           LlvmCodeGen                (llvmVersionList)
 import           Control.Monad
 import           Data.List                  (intercalate)
 import           Data.Maybe
 import           Data.Version
 import           DynFlags
+import           FileCleanup
+import           LlvmCodeGen                (llvmVersionList)
 import           Module                     (rtsUnitId, toInstalledUnitId)
+import           Packages
+import           Panic
 import           System.Directory
 import           System.FilePath
 import           System.Info
+import           SysTools
 
 import           Development.IDE.GHC.Compat as Compat
 

Diff for: ghcide/src/Development/IDE/GHC/Compat/Core.hs

@@ -935,11 +935,7 @@ addBootSuffixLocnOut :: GHC.ModLocation -> GHC.ModLocation
 addBootSuffixLocnOut = Module.addBootSuffixLocnOut
 
 dataConExTyCoVars :: DataCon -> [TyCoVar]
-#if __GLASGOW_HASKELL__ >= 808
 dataConExTyCoVars = DataCon.dataConExTyCoVars
-#else
-dataConExTyCoVars = DataCon.dataConExTyVars
-#endif
 
 #if !MIN_VERSION_ghc(9,0,0)
 -- Linear Haskell
@@ -953,7 +949,7 @@ unrestricted = id
 
 mkVisFunTys :: [Scaled Type] -> Type -> Type
 mkVisFunTys =
-#if __GLASGOW_HASKELL__ <= 808
+#if __GLASGOW_HASKELL__ == 808
   mkFunTys
 #else
   TcType.mkVisFunTys

Diff for: ghcide/src/Development/IDE/GHC/Compat/Plugins.hs

@@ -4,9 +4,7 @@
 module Development.IDE.GHC.Compat.Plugins (
     Plugin(..),
     defaultPlugin,
-#if __GLASGOW_HASKELL__ >= 808
     PluginWithArgs(..),
-#endif
     applyPluginsParsedResultAction,
     initializePlugins,
 

Diff for: hls-graph/src/Development/IDE/Graph/Internal/Types.hs

@@ -12,11 +12,6 @@ module Development.IDE.Graph.Internal.Types where
 
 import           Control.Applicative
 import           Control.Monad.Catch
-#if __GLASGOW_HASKELL__ < 808
-import           Control.Concurrent.STM.Stats  (TVar, atomically)
-#else
-import           GHC.Conc                      (TVar, atomically)
-#endif
 import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Reader
 import           Data.Aeson                    (FromJSON, ToJSON)
@@ -31,6 +26,7 @@ import           Data.List                     (intercalate)
 import           Data.Maybe
 import           Data.Typeable
 import           Development.IDE.Graph.Classes
+import           GHC.Conc                      (TVar, atomically)
 import           GHC.Generics                  (Generic)
 import qualified ListT
 import qualified StmContainers.Map             as SMap

Diff for: plugins/hls-tactics-plugin/src/Wingman/LanguageServer.hs

@@ -68,12 +68,12 @@ import Development.IDE.Types.Logger (Recorder, cmapWithPrio, WithPriority, Prett
 import qualified Development.IDE.Core.Shake as Shake
 
 
-newtype Log 
+newtype Log
   = LogShake Shake.Log
   deriving Show
 
 instance Pretty Log where
-  pretty = \case 
+  pretty = \case
     LogShake shakeLog -> pretty shakeLog
 
 tacticDesc :: T.Text -> T.Text
@@ -425,9 +425,7 @@ buildPatHy prov (fromPatCompat -> p0) =
           mkDerivedConHypothesis prov con args $ zip [0..] [pgt, pgt5]
         RecCon r ->
           mkDerivedRecordHypothesis prov con args r
-#if __GLASGOW_HASKELL__ >= 808
     SigPat  _ p _ -> buildPatHy prov p
-#endif
 #if __GLASGOW_HASKELL__ == 808
     XPat   p      -> buildPatHy prov $ unLoc p
 #endif
@@ -585,7 +583,7 @@ wingmanRules recorder plId = do
 #endif
                         | isHole occ ->
                             maybeToList $ srcSpanToRange span
-#if __GLASGOW_HASKELL__ <= 808
+#if __GLASGOW_HASKELL__ == 808
                       L span (EWildPat _) ->
                         maybeToList $ srcSpanToRange span
 #endif

Diff for: plugins/hls-tactics-plugin/src/Wingman/LanguageServer/TacticProviders.hs

@@ -150,25 +150,13 @@ commandProvider Refine =
   requireHoleSort (== Hole) $
     provide Refine ""
 commandProvider BeginMetaprogram =
-  requireGHC88OrHigher $
   requireHoleSort (== Hole) $
     provide BeginMetaprogram ""
 commandProvider RunMetaprogram =
-  requireGHC88OrHigher $
   withMetaprogram $ \mp ->
     provide RunMetaprogram mp
 
 
-requireGHC88OrHigher :: TacticProvider -> TacticProvider
-#if __GLASGOW_HASKELL__ >= 808
-requireGHC88OrHigher tp tpd =
-  tp tpd
-#else
-requireGHC88OrHigher _ _=
-  mempty
-#endif
-
-
 ------------------------------------------------------------------------------
 -- | Return an empty list if the given predicate doesn't hold over the length
 guardLength :: (Int -> Bool) -> [a] -> [a]

Diff for: plugins/hls-tactics-plugin/src/Wingman/StaticPlugin.hs

@@ -14,15 +14,13 @@ import GHC.LanguageExtensions.Type (Extension(EmptyCase, QuasiQuotes))
 
 import Ide.Types
 
-#if __GLASGOW_HASKELL__ >= 808
 import Data.Data
 import Generics.SYB
 #if __GLASGOW_HASKELL__ >= 900
 import GHC.Driver.Plugins (purePlugin)
 #else
 import Plugins (purePlugin)
 #endif
-#endif
 
 staticPlugin :: DynFlagsModifications
 staticPlugin = mempty
@@ -34,13 +32,9 @@ staticPlugin = mempty
              { refLevelHoleFits = Just 0
              , maxRefHoleFits   = Just 0
              , maxValidHoleFits = Just 0
-#if __GLASGOW_HASKELL__ >= 808
              , staticPlugins = staticPlugins df <> [metaprogrammingPlugin]
-#endif
              }
-#if __GLASGOW_HASKELL__ >= 808
   , dynFlagsModifyParser = enableQuasiQuotes
-#endif
   }
 
 
@@ -71,7 +65,6 @@ allowEmptyCaseButWithWarning =
   flip xopt_set EmptyCase . flip wopt_set Opt_WarnIncompletePatterns
 
 
-#if __GLASGOW_HASKELL__ >= 808
 metaprogrammingPlugin :: StaticPlugin
 metaprogrammingPlugin =
     StaticPlugin $ PluginWithArgs pluginDefinition  []
@@ -101,7 +94,6 @@ addMetaprogrammingSyntax =
     L ss (MetaprogramSyntax mp) ->
       L ss $ mkMetaprogram ss mp
     (x :: LHsExpr GhcPs) -> x
-#endif
 
 metaprogramHoleName :: OccName
 metaprogramHoleName = mkVarOcc "_$metaprogram"

Diff for: plugins/hls-tactics-plugin/test/CodeAction/RunMetaprogramSpec.hs

@@ -11,17 +11,11 @@ import  Wingman.Types
 spec :: Spec
 spec = do
   let metaTest l c f =
-#if __GLASGOW_HASKELL__ >= 808
         goldenTest RunMetaprogram "" l c f
-#else
-        pure ()
-#endif
 
-#if __GLASGOW_HASKELL__ >= 808
   describe "beginMetaprogram" $ do
     goldenTest BeginMetaprogram ""  1  7 "MetaBegin"
     goldenTest BeginMetaprogram ""  1  9 "MetaBeginNoWildify"
-#endif
 
   describe "golden" $ do
     metaTest  6 11 "MetaMaybeAp"