@@ -22,7 +22,7 @@ import qualified TcHsSyn
22
22
import qualified CoreUtils
23
23
import qualified Type
24
24
import qualified Desugar
25
- import Haskell.Ide.Engine.Compat
25
+ import qualified Haskell.Ide.Engine.Compat as Compat
26
26
27
27
import Haskell.Ide.Engine.ArtifactMap
28
28
@@ -40,7 +40,7 @@ everythingInTypecheckedSourceM xs = bs
40
40
where
41
41
bs = foldBag (liftA2 IM. union) processBind (return IM. empty) xs
42
42
43
- processBind :: GhcMonad m => GHC. LHsBindLR GHC . GhcTc GHC . GhcTc -> m TypeMap
43
+ processBind :: GhcMonad m => GHC. LHsBindLR Compat . GhcTc Compat . GhcTc -> m TypeMap
44
44
processBind x@ (GHC. L (GHC. RealSrcSpan spn) b) =
45
45
case b of
46
46
GHC. FunBind _ fid fmatches _ _ ->
@@ -73,7 +73,7 @@ types = everythingButTypeM @GHC.Id (ty `combineM` fun `combineM` funBind)
73
73
74
74
funBind :: forall a' . (GhcMonad m , Data a' ) => a' -> m TypeMap
75
75
funBind term = case cast term of
76
- (Just (GHC. L (GHC. RealSrcSpan spn) (FunBindType t))) ->
76
+ (Just (GHC. L (GHC. RealSrcSpan spn) (Compat. FunBindType t))) ->
77
77
return (IM. singleton (rspToInt spn) t)
78
78
_ -> return IM. empty
79
79
@@ -128,19 +128,19 @@ everythingButM f x = do
128
128
--
129
129
-- See #16233<https://gitlab.haskell.org/ghc/ghc/issues/16233>
130
130
getType
131
- :: GhcMonad m => GHC. LHsExpr GhcTc -> m (Maybe (GHC. SrcSpan , Type. Type ))
131
+ :: GhcMonad m => GHC. LHsExpr Compat. GhcTc -> m (Maybe (GHC. SrcSpan , Type. Type ))
132
132
getType e@ (GHC. L spn e') =
133
133
-- Some expression forms have their type immediately available
134
134
let
135
135
tyOpt = case e' of
136
- HsOverLitType t -> Just t
137
- HsLitType t -> Just t
138
- HsLamType t -> Just t
139
- HsLamCaseType t -> Just t
140
- HsCaseType t -> Just t
141
- ExplicitListType t -> Just t
142
- ExplicitSumType t -> Just t
143
- HsMultiIfType t -> Just t
136
+ Compat. HsOverLitType t -> Just t
137
+ Compat. HsLitType t -> Just t
138
+ Compat. HsLamType t -> Just t
139
+ Compat. HsLamCaseType t -> Just t
140
+ Compat. HsCaseType t -> Just t
141
+ Compat. ExplicitListType t -> Just t
142
+ Compat. ExplicitSumType t -> Just t
143
+ Compat. HsMultiIfType t -> Just t
144
144
145
145
_ -> Nothing
146
146
in case tyOpt of
0 commit comments