Compat with 8.6

Author: pepeiborra

ghcide/src/Development/IDE/GHC/Compat.hs

@@ -60,7 +60,7 @@ module Development.IDE.GHC.Compat(
     module Compat.HieTypes,
     module Compat.HieUtils,
     dropForAll
-    ) where
+    ,isQualifiedImport) where
 
 #if MIN_GHC_API_VERSION(8,10,0)
 import LinkerTypes
@@ -300,3 +300,12 @@ pattern FunTy arg res <- TyCoRep.FunTy {ft_arg = arg, ft_res = res}
 #else
 pattern FunTy arg res <- TyCoRep.FunTy arg res
 #endif
+
+isQualifiedImport :: ImportDecl a -> Bool
+#if MIN_GHC_API_VERSION(8,10,0)
+isQualifiedImport ImportDecl{ideclQualified = NotQualified} = False
+isQualifiedImport ImportDecl{} = True
+#else
+isQualifiedImport ImportDecl{ideclQualified} = ideclQualified
+#endif
+isQualifiedImport _ = False

ghcide/src/Development/IDE/Plugin/Completions.hs

@@ -185,7 +185,8 @@ extendImportHandler' ideState ExtendImport {..}
     mzero
 
 isWantedModule :: ModuleName -> GenLocated l (ImportDecl pass) -> Bool
-isWantedModule wantedModule (L _ ImportDecl{ideclName, ideclHiding = Just (False, _), ideclQualified = NotQualified}) = unLoc ideclName == wantedModule
+isWantedModule wantedModule (L _ it@ImportDecl{ideclName, ideclHiding = Just (False, _)}) =
+    not (isQualifiedImport it) && unLoc ideclName == wantedModule
 isWantedModule _ _ = False
 
 liftMaybe :: Monad m => Maybe a -> MaybeT m a

plugins/hls-explicit-imports-plugin/src/Ide/Plugin/ExplicitImports.hs

@@ -248,15 +248,6 @@ runIde state = runAction "importLens" state
 
 --------------------------------------------------------------------------------
 
-isQualifiedImport :: ImportDecl a -> Bool
-#if MIN_GHC_API_VERSION(8,10,0)
-isQualifiedImport ImportDecl{ideclQualified = NotQualified} = False
-isQualifiedImport ImportDecl{} = True
-#else
-isQualifiedImport ImportDecl{ideclQualified} = ideclQualified
-#endif
-isQualifiedImport _ = False
-
 within :: Range -> SrcSpan -> Bool
 within (Range start end) span =
   isInsideSrcSpan start span || isInsideSrcSpan end span