address PR comments

Author: alexnaspo

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

@@ -16,7 +16,7 @@ import           Data.Aeson
 import qualified Data.HashMap.Strict                          as Map
 import qualified Data.HashSet                                 as Set
 import           Data.List                                    (find)
-import qualified Data.Map                                     as DM (Map, fromListWith, empty)
+import qualified Data.HashMap.Strict                          as HM
 import           Data.Maybe
 import qualified Data.Text                                    as T
 import           Development.IDE.Core.PositionMapping
@@ -140,21 +140,21 @@ getCompletionsLSP ide plId
             binds <- fromMaybe (mempty, zeroMapping) <$> useWithStaleFast GetBindings npath
             exportsMapIO <- fmap(envPackageExports . fst) <$> useWithStaleFast GhcSession npath
             exportsMap <- mapM liftIO exportsMapIO
-            let moduleExports = buildModouleExportMap exportsMap
-            let exportsCompItems = foldMap (map (fromIdentInfo uri) . Set.toList) . Map.elems . getExportsMap <$> exportsMap
+            let moduleExports = buildModuleExportMap exportsMap
+                exportsCompItems = foldMap (map (fromIdentInfo uri) . Set.toList) . Map.elems . getExportsMap <$> exportsMap
                 exportsCompls = mempty{anyQualCompls = fromMaybe [] exportsCompItems}
             let compls = (fst <$> localCompls) <> (fst <$> nonLocalCompls) <> Just exportsCompls
             pure (opts, fmap (,pm,binds) compls, moduleExports)
-        case (compls, moduleExports) of
-          (Just (cci', parsedMod, bindMap), mExports) -> do
+        case compls of
+          (Just (cci', parsedMod, bindMap)) -> do
             pfix <- VFS.getCompletionPrefix position cnts
             case (pfix, completionContext) of
               (Just (VFS.PosPrefixInfo _ "" _ _), Just CompletionContext { _triggerCharacter = Just "."})
                 -> return (InL $ List [])
               (Just pfix', _) -> do
                 let clientCaps = clientCapabilities $ shakeExtras ide
                 config <- getCompletionsConfig plId
-                allCompletions <- liftIO $ getCompletions plId ideOpts cci' parsedMod bindMap pfix' clientCaps config mExports
+                allCompletions <- liftIO $ getCompletions plId ideOpts cci' parsedMod bindMap pfix' clientCaps config moduleExports
                 pure $ InL (List allCompletions)
               _ -> return (InL $ List [])
           _ -> return (InL $ List [])
@@ -166,14 +166,14 @@ identInfoToKeyVal :: IdentInfo -> (T.Text, T.Text)
 identInfoToKeyVal IdentInfo {rendered, moduleNameText} =
   (moduleNameText, rendered)
 
-buildModouleExportMap:: Maybe (ExportsMap) -> DM.Map T.Text [T.Text]
-buildModouleExportMap (Just exportsMap) = do
+buildModuleExportMap:: Maybe ExportsMap -> HM.HashMap T.Text [T.Text]
+buildModuleExportMap (Just exportsMap) = do
   sortAndGroup $ map identInfoToKeyVal $ 
     concatMap (Set.toList . snd) $ toList $ getExportsMap exportsMap
-buildModouleExportMap (Nothing) = DM.empty 
+buildModuleExportMap Nothing = HM.empty 
 
-sortAndGroup :: [(T.Text, T.Text)] -> DM.Map T.Text [T.Text]
-sortAndGroup assocs = DM.fromListWith (++) [(k, [v]) | (k, v) <- assocs]  
+sortAndGroup :: [(T.Text, T.Text)] -> HM.HashMap T.Text [T.Text]
+sortAndGroup assocs = HM.fromListWith (++) [(k, [v]) | (k, v) <- assocs]  
 
 extendImportCommand :: PluginCommand IdeState
 extendImportCommand =

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

@@ -41,7 +41,7 @@ import           Control.Monad
 import           Data.Aeson                               (ToJSON (toJSON))
 import           Data.Either                              (fromRight)
 import           Data.Functor
-import qualified Data.Map                                 as DM (Map)
+import qualified Data.HashMap.Strict                      as HM
 import qualified Data.Set                                 as Set
 import           Development.IDE.Core.Compile
 import           Development.IDE.Core.PositionMapping
@@ -539,7 +539,7 @@ getCompletions
     -> VFS.PosPrefixInfo
     -> ClientCapabilities
     -> CompletionsConfig
-    -> DM.Map T.Text [T.Text]
+    -> HM.HashMap T.Text [T.Text]
     -> IO [CompletionItem]
 getCompletions plId ideOpts CC {allModNamesAsNS, anyQualCompls, unqualCompls, qualCompls, importableModules}
                maybe_parsed (localBindings, bmapping) prefixInfo caps config exportsMap = do
@@ -634,8 +634,8 @@ getCompletions plId ideOpts CC {allModNamesAsNS, anyQualCompls, unqualCompls, qu
       && (List.length (words (T.unpack fullLine)) >= 2)
       && "(" `isInfixOf` T.unpack fullLine
     -> do  
-      let moduleName = (words (T.unpack fullLine)) !! 1
-          funcs = Map.findWithDefault [] (T.pack moduleName) exportsMap
+      let moduleName = words (T.unpack fullLine) !! 1
+          funcs = HM.findWithDefault [] (T.pack moduleName) exportsMap
       return (map (mkModuleFunctionImport (T.pack moduleName)) funcs)
     | "import " `T.isPrefixOf` fullLine
     -> do