Add back -d option to modules command

Language/Haskell/GhcMod/Gap.hs

@@ -38,6 +38,7 @@ module Language.Haskell.GhcMod.Gap (
   , occName
   , listVisibleModuleNames
   , listVisibleModules
+  , lookupModulePackageInAllPackages
   , Language.Haskell.GhcMod.Gap.isSynTyCon
   , parseModuleHeader
   ) where
@@ -89,20 +90,18 @@ import RdrName (rdrNameOcc)
 
 #if __GLASGOW_HASKELL__ < 710
 import UniqFM (eltsUFM)
-import Packages (exposedModules, exposed, pkgIdMap)
-import PackageConfig (PackageConfig, packageConfigId)
+import Module
 #endif
 
 #if __GLASGOW_HASKELL__ >= 704
 import qualified Data.IntSet as I (IntSet, empty)
 #endif
 
-
 import Bag
 import Lexer as L
 import Parser
 import SrcLoc
-
+import Packages
 
 ----------------------------------------------------------------
 ----------------------------------------------------------------
@@ -476,6 +475,20 @@ listVisibleModuleNames :: DynFlags -> [ModuleName]
 listVisibleModuleNames = allExposedModules
 #endif
 
+lookupModulePackageInAllPackages ::
+    DynFlags -> ModuleName -> [String]
+lookupModulePackageInAllPackages df mn =
+#if __GLASGOW_HASKELL__ >= 710
+    unpackSPId . sourcePackageId . snd <$> lookupModuleInAllPackages df mn
+ where
+   unpackSPId (SourcePackageId fs) = unpackFS fs
+#else
+    unpackPId . sourcePackageId . fst <$> lookupModuleInAllPackages df mn
+ where
+   unpackPId pid = packageIdString $ mkPackageId pid
+--       n ++ "-" ++ showVersion v
+#endif
+
 listVisibleModules :: DynFlags -> [GHC.Module]
 listVisibleModules df = let
 #if __GLASGOW_HASKELL__ >= 710

Language/Haskell/GhcMod/Modules.hs

@@ -1,15 +1,26 @@
 module Language.Haskell.GhcMod.Modules (modules) where
 
-import qualified GHC as G
+import Control.Arrow
+import Data.List
 import Language.Haskell.GhcMod.Convert
+import Language.Haskell.GhcMod.Types
 import Language.Haskell.GhcMod.Monad
-import Language.Haskell.GhcMod.Gap (listVisibleModuleNames)
-import Module (moduleNameString)
+import Language.Haskell.GhcMod.Gap ( listVisibleModuleNames
+                                   , lookupModulePackageInAllPackages
+                                   )
+
+import qualified GHC as G
 
 ----------------------------------------------------------------
 
 -- | Listing installed modules.
 modules :: (IOish m, GmEnv m) => m String
 modules = do
-  dflags <- runGmPkgGhc G.getSessionDynFlags
-  convert' $ map moduleNameString $ listVisibleModuleNames dflags
+  Options { detailed } <- options
+  df <- runGmPkgGhc G.getSessionDynFlags
+  let mns = listVisibleModuleNames df
+      pmnss = map (first moduleNameString) $ zip mns (modulePkg df `map` mns)
+  convert' $ nub [ if detailed then pkg ++ " " ++ mn else mn
+                 | (mn, pkgs) <- pmnss, pkg <- pkgs ]
+ where
+   modulePkg df = lookupModulePackageInAllPackages df