Add support for 8.2.1 - 8.4.4 for FunBind

Author: fendor

hie-plugin-api/Haskell/Ide/Engine/Compat.hs

@@ -7,6 +7,7 @@ import qualified GHC
 import qualified Type
 import qualified TcHsSyn
 import qualified TysWiredIn
+import qualified Var
 
 #if MIN_VERSION_filepath(1,4,2)
 #else
@@ -123,6 +124,17 @@ pattern HsMultiIfType t <-
     GHC.HsMultiIf t _
 #endif
 
+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
+
+
 #if MIN_VERSION_ghc(8, 6, 0)
 matchGroupType :: GHC.MatchGroupTc -> GHC.Type
 matchGroupType (GHC.MatchGroupTc args res) = Type.mkFunTys args res

hie-plugin-api/Haskell/Ide/Engine/TypeMap.hs

@@ -18,7 +18,6 @@ import qualified TcHsSyn
 import qualified CoreUtils
 import qualified Type
 import qualified Desugar
-import qualified Var
 import           Haskell.Ide.Engine.Compat
 
 import           Haskell.Ide.Engine.ArtifactMap
@@ -57,8 +56,8 @@ types hs_env = everythingInTypecheckedSourceM (ty `combineM` fun `combineM` funB
 
   funBind :: forall a . Data a => a -> IO TypeMap
   funBind term = case cast term of
-    (Just (GHC.L (GHC.RealSrcSpan spn) ((GHC.FunBind _ (GHC.L _ (idp :: GHC.IdP GhcTc)) _ _ _) :: GHC.HsBindLR GhcTc GhcTc))) ->
-      return (IM.singleton (rspToInt spn) (Var.varType idp))
+    (Just (GHC.L (GHC.RealSrcSpan spn) (FunBindType t))) ->
+      return (IM.singleton (rspToInt spn) t)
     _ -> return IM.empty
 
 -- | Combine two queries into one using alternative combinator.