From 017d4cc22ff0bb54307c4d01a7f0f306fb8124e4 Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Sun, 27 Apr 2014 22:48:24 +0900 Subject: [PATCH] don't use InteractiveImport for old GHCs.. --- Language/Haskell/GhcMod/Gap.hs | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Language/Haskell/GhcMod/Gap.hs b/Language/Haskell/GhcMod/Gap.hs index 31555a8..7d8706f 100644 --- a/Language/Haskell/GhcMod/Gap.hs +++ b/Language/Haskell/GhcMod/Gap.hs @@ -202,23 +202,21 @@ withContext action = gbracket setup teardown body body _ = do topImports >>= setContext action - -topImports :: Ghc [InteractiveImport] -topImports = do - mss <- getModuleGraph + topImports = do + mss <- getModuleGraph #if __GLASGOW_HASKELL__ >= 706 - let modName = IIModule . moduleName . ms_mod + let modName = IIModule . moduleName . ms_mod #elif __GLASGOW_HASKELL__ >= 704 - let modName = IIModule . ms_mod + let modName = IIModule . ms_mod #else - let modName = ms_mod + let modName = ms_mod #endif - map modName <$> filterM isTop mss - where - isTop mos = lookupMod ||> returnFalse + map modName <$> filterM isTop mss where - lookupMod = lookupModule (ms_mod_name mos) Nothing >> return True - returnFalse = return False + isTop mos = lookupMod ||> returnFalse + where + lookupMod = lookupModule (ms_mod_name mos) Nothing >> return True + returnFalse = return False showSeverityCaption :: Severity -> String #if __GLASGOW_HASKELL__ >= 706