mirror of
https://github.com/haskell/haskell-ide-engine.git
synced 2024-10-26 11:18:42 +03:00
Drop CPP directives guarding GHC 8.2.2 statements
This commit is contained in:
parent
257eda54bb
commit
4d748f5d08
@ -92,11 +92,7 @@ genImportMap tm = moduleMap
|
||||
where
|
||||
(_, lImports, mlies, _) = fromJust $ GHC.tm_renamed_source tm
|
||||
|
||||
#if __GLASGOW_HASKELL__ > 802
|
||||
lies = map fst $ fromMaybe [] mlies
|
||||
#else
|
||||
lies = fromMaybe [] mlies
|
||||
#endif
|
||||
|
||||
moduleMap :: ModuleMap
|
||||
moduleMap = foldl goImp IM.empty lImports `IM.union` foldl goExp IM.empty lies
|
||||
|
@ -37,18 +37,12 @@ isExtensionOf ext = isSuffixOf ('.':ext) . takeExtensions
|
||||
#endif
|
||||
|
||||
|
||||
#if MIN_VERSION_ghc(8, 4, 0)
|
||||
type GhcTc = GHC.GhcTc
|
||||
#else
|
||||
type GhcTc = GHC.Id
|
||||
#endif
|
||||
|
||||
pattern HsOverLitType :: Type.Type -> GHC.HsExpr GhcTc
|
||||
pattern HsOverLitType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.HsOverLit _ (GHC.overLitType -> t)
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.HsOverLit (GHC.overLitType -> t)
|
||||
#else
|
||||
GHC.HsOverLit (GHC.overLitType -> t)
|
||||
#endif
|
||||
@ -57,8 +51,6 @@ pattern HsLitType :: Type.Type -> GHC.HsExpr GhcTc
|
||||
pattern HsLitType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.HsLit _ (TcHsSyn.hsLitType -> t)
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.HsLit (TcHsSyn.hsLitType -> t)
|
||||
#else
|
||||
GHC.HsLit (TcHsSyn.hsLitType -> t)
|
||||
#endif
|
||||
@ -67,8 +59,6 @@ pattern HsLamType :: Type.Type -> GHC.HsExpr GhcTc
|
||||
pattern HsLamType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.HsLam _ ((\(GHC.MG { GHC.mg_ext = groupTy }) -> matchGroupType groupTy) -> t)
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.HsLam (\GHC.MG { GHC.mg_res_ty = res, GHC.mg_arg_tys = args } -> Type.mkFunTys args res -> t)
|
||||
#else
|
||||
GHC.HsLam (\GHC.MG { GHC.mg_res_ty = res, GHC.mg_arg_tys = args } -> Type.mkFunTys args res -> t)
|
||||
#endif
|
||||
@ -77,8 +67,6 @@ pattern HsLamCaseType :: Type.Type -> GHC.HsExpr GhcTc
|
||||
pattern HsLamCaseType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.HsLamCase _ ((\(GHC.MG { GHC.mg_ext = groupTy }) -> matchGroupType groupTy) -> t)
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.HsLamCase (\GHC.MG { GHC.mg_res_ty = res, GHC.mg_arg_tys = args } -> Type.mkFunTys args res -> t)
|
||||
#else
|
||||
GHC.HsLamCase (\GHC.MG { GHC.mg_res_ty = res, GHC.mg_arg_tys = args } -> Type.mkFunTys args res -> t)
|
||||
#endif
|
||||
@ -87,8 +75,6 @@ pattern HsCaseType :: Type.Type -> GHC.HsExpr GhcTc
|
||||
pattern HsCaseType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.HsCase _ _ ((\(GHC.MG { GHC.mg_ext = groupTy }) -> matchGroupType groupTy) -> t)
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.HsCase _ (\GHC.MG { GHC.mg_res_ty = res, GHC.mg_arg_tys = args } -> Type.mkFunTys args res -> t)
|
||||
#else
|
||||
GHC.HsCase _ (\GHC.MG { GHC.mg_res_ty = res, GHC.mg_arg_tys = args } -> Type.mkFunTys args res -> t)
|
||||
#endif
|
||||
@ -97,8 +83,6 @@ pattern ExplicitListType :: Type.Type -> GHC.HsExpr GhcTc
|
||||
pattern ExplicitListType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.ExplicitList (TysWiredIn.mkListTy -> t) _ _
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.ExplicitList (TysWiredIn.mkListTy -> t) _ _
|
||||
#else
|
||||
GHC.ExplicitList (TysWiredIn.mkListTy -> t) _ _
|
||||
#endif
|
||||
@ -107,8 +91,6 @@ pattern ExplicitSumType :: Type.Type -> GHC.HsExpr GhcTc
|
||||
pattern ExplicitSumType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.ExplicitSum (TysWiredIn.mkSumTy -> t) _ _ _
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.ExplicitSum _ _ _ (TysWiredIn.mkSumTy -> t)
|
||||
#else
|
||||
GHC.ExplicitSum _ _ _ (TysWiredIn.mkSumTy -> t)
|
||||
#endif
|
||||
@ -118,8 +100,6 @@ pattern HsMultiIfType :: Type.Type -> GHC.HsExpr GhcTc
|
||||
pattern HsMultiIfType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.HsMultiIf t _
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.HsMultiIf t _
|
||||
#else
|
||||
GHC.HsMultiIf t _
|
||||
#endif
|
||||
@ -128,8 +108,6 @@ pattern FunBindType :: Type.Type -> GHC.HsBindLR GhcTc GhcTc
|
||||
pattern FunBindType t <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.FunBind _ (GHC.L _ (Var.varType -> t)) _ _ _
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.FunBind (GHC.L _ (Var.varType -> t)) _ _ _ _
|
||||
#else
|
||||
GHC.FunBind (GHC.L _ (Var.varType -> t)) _ _ _ _
|
||||
#endif
|
||||
@ -138,8 +116,6 @@ pattern FunBindGen :: Type.Type -> GHC.MatchGroup GhcTc (GHC.LHsExpr GhcTc) -> G
|
||||
pattern FunBindGen t fmatches <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.FunBind _ (GHC.L _ (Var.varType -> t)) fmatches _ _
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.FunBind (GHC.L _ (Var.varType -> t)) fmatches _ _ _
|
||||
#else
|
||||
GHC.FunBind (GHC.L _ (Var.varType -> t)) fmatches _ _ _
|
||||
#endif
|
||||
@ -148,10 +124,8 @@ pattern AbsBinds :: GHC.LHsBinds GhcTc -> GHC.HsBindLR GhcTc GhcTc
|
||||
pattern AbsBinds bs <-
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
GHC.AbsBinds _ _ _ _ _ bs _
|
||||
#elif MIN_VERSION_ghc(8, 4, 0)
|
||||
GHC.AbsBinds _ _ _ _ bs _
|
||||
#else
|
||||
GHC.AbsBinds _ _ _ _ bs
|
||||
GHC.AbsBinds _ _ _ _ bs _
|
||||
#endif
|
||||
|
||||
#if MIN_VERSION_ghc(8, 6, 0)
|
||||
|
@ -1,9 +1,6 @@
|
||||
{-# LANGUAGE CPP #-}
|
||||
module Haskell.Ide.Engine.Options where
|
||||
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Semigroup hiding (option)
|
||||
#endif
|
||||
import Options.Applicative.Simple
|
||||
|
||||
data GlobalOpts = GlobalOpts
|
||||
|
@ -1,4 +1,3 @@
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE DeriveAnyClass #-}
|
||||
{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE DuplicateRecordFields #-}
|
||||
@ -27,11 +26,7 @@ import Haskell.Ide.Engine.PluginUtils
|
||||
import Language.Haskell.Exts.SrcLoc
|
||||
import Language.Haskell.Exts.Parser
|
||||
import Language.Haskell.Exts.Extension
|
||||
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,0,0)))
|
||||
import Language.Haskell.HLint4 as Hlint
|
||||
#else
|
||||
import Language.Haskell.HLint3 as Hlint
|
||||
#endif
|
||||
import qualified Language.Haskell.LSP.Types as LSP
|
||||
import qualified Language.Haskell.LSP.Types.Lens as LSP
|
||||
import Refact.Apply
|
||||
|
@ -11,9 +11,6 @@ import Data.Aeson
|
||||
import Data.Foldable
|
||||
import qualified Data.Map as Map
|
||||
import Data.Maybe
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Semigroup
|
||||
#endif
|
||||
import qualified Data.Text as T
|
||||
import qualified Data.Versions as V
|
||||
import Development.GitRev (gitCommitCount)
|
||||
|
@ -13,13 +13,7 @@ module Haskell.Ide.Engine.Plugin.Build where
|
||||
#endif
|
||||
|
||||
import qualified Data.Aeson as J
|
||||
#if __GLASGOW_HASKELL__ < 802
|
||||
import qualified Data.Aeson.Types as J
|
||||
#endif
|
||||
import Data.Maybe (fromMaybe)
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Monoid
|
||||
#endif
|
||||
import Control.Monad
|
||||
import Control.Monad.IO.Class
|
||||
import Control.Monad.Trans.Reader
|
||||
|
@ -1,4 +1,3 @@
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE DeriveAnyClass #-}
|
||||
{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE DuplicateRecordFields #-}
|
||||
@ -9,9 +8,6 @@ import Control.Lens
|
||||
import Control.Monad.IO.Class
|
||||
import Data.Aeson
|
||||
import qualified Data.HashMap.Strict as H
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Monoid
|
||||
#endif
|
||||
import qualified Data.Map as Map
|
||||
import qualified Data.Set as S
|
||||
import qualified Data.Text as T
|
||||
|
@ -1,4 +1,3 @@
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE NamedFieldPuns #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
@ -14,9 +13,6 @@ import qualified Data.Aeson.Types as J
|
||||
import Data.Algorithm.Diff
|
||||
import Data.Algorithm.DiffOutput
|
||||
import Data.Foldable
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Monoid
|
||||
#endif
|
||||
import qualified Data.Text as T
|
||||
import qualified Data.Text.IO as T
|
||||
import Exception
|
||||
|
@ -1,4 +1,3 @@
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE NamedFieldPuns #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# LANGUAGE RankNTypes #-}
|
||||
@ -9,9 +8,6 @@ module Haskell.Ide.Engine.Plugin.Haddock where
|
||||
import Control.Monad.State
|
||||
import Data.Foldable
|
||||
import qualified Data.Map as Map
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Monoid
|
||||
#endif
|
||||
import qualified Data.Text as T
|
||||
import Data.IORef
|
||||
import Data.Function
|
||||
@ -195,9 +191,7 @@ renderMarkDown =
|
||||
["```\n"])
|
||||
, markupHeader = \h ->
|
||||
T.replicate (headerLevel h) "#" <> " " <> headerTitle h <> "\n"
|
||||
#if __GLASGOW_HASKELL__ >= 804
|
||||
, markupTable = mempty
|
||||
#endif
|
||||
}
|
||||
where surround c x = c <> T.replace c "" x <> c
|
||||
removeInner x = T.replace "```" "" $ T.replace "```haskell" "" x
|
||||
|
@ -1,6 +1,5 @@
|
||||
{-# LANGUAGE TupleSections #-}
|
||||
{-# LANGUAGE LambdaCase #-}
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
module Haskell.Ide.Engine.Plugin.Hoogle where
|
||||
|
||||
@ -11,9 +10,6 @@ import Control.Applicative (liftA2)
|
||||
import Data.Aeson
|
||||
import Data.Bifunctor
|
||||
import Data.Maybe
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Monoid
|
||||
#endif
|
||||
import qualified Data.Text as T
|
||||
import Data.List
|
||||
import Haskell.Ide.Engine.MonadTypes
|
||||
|
@ -1,4 +1,3 @@
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE DuplicateRecordFields #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
@ -10,9 +9,6 @@ import Control.Monad
|
||||
import Control.Monad.IO.Class
|
||||
import Control.Monad.Trans
|
||||
import Control.Exception (bracket)
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Monoid
|
||||
#endif
|
||||
import Data.Aeson
|
||||
import qualified Data.ByteString.Lazy as BS
|
||||
import qualified Data.Map as Map
|
||||
|
@ -1,4 +1,3 @@
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE DeriveAnyClass #-}
|
||||
{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE DuplicateRecordFields #-}
|
||||
@ -21,9 +20,6 @@ import Control.Monad.IO.Class
|
||||
import qualified Data.Aeson as J
|
||||
import qualified Data.ByteString.Builder as B
|
||||
import qualified Data.ByteString.Lazy.Char8 as B
|
||||
#if __GLASGOW_HASKELL__ < 804
|
||||
import Data.Monoid
|
||||
#endif
|
||||
import qualified Data.Text as T
|
||||
import GHC.Generics
|
||||
import Haskell.Ide.Engine.PluginsIdeMonads
|
||||
|
Loading…
Reference in New Issue
Block a user