From 512c77b2042a1bc4662d2b49b80ac310b0b99d97 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti <p.capriotti@gmail.com> Date: Sat, 31 Mar 2012 15:48:57 +0100 Subject: [PATCH] Respect package qualifier when validating imports in GHCi (#5979) MERGED from commit a39a19254003f593e49fa0b29c8a10444cc204c2 --- ghc/InteractiveUI.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index a2061c2e1068..f88f9108bc7d 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -1627,7 +1627,7 @@ remModulesFromContext as bs = do addImportToContext :: String -> GHCi () addImportToContext str = do idecl <- GHC.parseImportDecl str - _ <- GHC.lookupModule (unLoc (ideclName idecl)) Nothing -- #5836 + _ <- GHC.lookupModule (unLoc (ideclName idecl)) (ideclPkgQual idecl) -- #5836 modifyGHCiState $ \st -> st { remembered_ctx = addNotSubsumed (IIDecl idecl) (remembered_ctx st) , transient_ctx = filter (not . ((IIDecl idecl) `iiSubsumes`)) -- GitLab