Fix ghc 9.8, less CPP

Author: jhrcek

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

@@ -36,6 +36,9 @@ import           System.IO.Unsafe
 import           System.Time.Extra             (Seconds)
 import           UnliftIO                      (MonadUnliftIO)
 
+#if !MIN_VERSION_base(4,18,0)
+import           Control.Applicative           (liftA2)
+#endif
 
 unwrapDynamic :: forall a . Typeable a => Dynamic -> a
 unwrapDynamic x = fromMaybe (error msg) $ fromDynamic x

plugins/hls-refactor-plugin/src/Development/IDE/Plugin/Plugins/AddArgument.hs

@@ -1,10 +1,6 @@
 {-# LANGUAGE CPP #-}
 module Development.IDE.Plugin.Plugins.AddArgument (plugin) where
 
-#if MIN_VERSION_ghc(9,4,0)
-import           Development.IDE.GHC.ExactPrint            (epl)
-import           GHC.Parser.Annotation                     (TokenLocation (..))
-#endif
 import           Control.Monad                             (join)
 import           Control.Monad.Trans.Class                 (lift)
 import           Data.Bifunctor                            (Bifunctor (..))
@@ -32,12 +28,18 @@ import           Language.Haskell.GHC.ExactPrint           (TransformT (..),
                                                             noAnnSrcSpanDP1,
                                                             runTransformT)
 import           Language.LSP.Protocol.Types
-#if !MIN_VERSION_ghc(9,3,0)
+
+#if !MIN_VERSION_ghc(9,4,0)
 import           GHC                                       (TrailingAnn (..))
 import           GHC.Hs                                    (IsUnicodeSyntax (..))
 import           Language.Haskell.GHC.ExactPrint.Transform (d1)
 #endif
 
+#if MIN_VERSION_ghc(9,4,0)
+import           Development.IDE.GHC.ExactPrint            (epl)
+import           GHC.Parser.Annotation                     (TokenLocation (..))
+#endif
+
 -- When GHC tells us that a variable is not bound, it will tell us either:
 --  - there is an unbound variable with a given type
 --  - there is an unbound variable (GHC provides no type suggestion)

plugins/hls-rename-plugin/src/Ide/Plugin/Rename.hs

@@ -10,7 +10,10 @@ module Ide.Plugin.Rename (descriptor, E.Log) where
 import           Compat.HieTypes
 import           Control.Lens                          ((^.))
 import           Control.Monad
-import           Control.Monad.Except
+import           Control.Monad.Except                  (ExceptT, MonadError,
+                                                        throwError)
+import           Control.Monad.IO.Class                (MonadIO, liftIO)
+import           Control.Monad.Trans.Class             (lift)
 import           Data.Bifunctor                        (first)
 import           Data.Generics
 import           Data.Hashable