Skip to content

Commit 0d32b35

Browse files
committed
Avoid using the Monoid instance (removed in 9.4 ?????)
1 parent df42555 commit 0d32b35

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ghcide/src/Development/IDE/Core/Compile.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ import Data.Unique as Unique
108108
import Development.IDE.Core.Tracing (withTrace)
109109
import qualified Language.LSP.Server as LSP
110110
import qualified Language.LSP.Types as LSP
111+
import UniqDFM (emptyUDFM, plusUDFM)
111112
import Unsafe.Coerce
112113

113114
-- | Given a string buffer, return the string (after preprocessing) and the 'ParsedModule'.
@@ -701,7 +702,7 @@ mergeEnvs env extraModSummaries extraMods envs = do
701702
(\fc (im, ifr) -> Compat.extendInstalledModuleEnv fc im ifr) prevFinderCache
702703
$ zip ims ifrs
703704
return $ loadModulesHome extraMods $ env{
704-
hsc_HPT = foldMap hsc_HPT envs,
705+
hsc_HPT = foldMapBy plusUDFM emptyUDFM hsc_HPT envs,
705706
hsc_FC = newFinderCache,
706707
hsc_mod_graph = mkModuleGraph $ extraModSummaries ++ nubOrdOn ms_mod (concatMap (mgModSummaries . hsc_mod_graph) envs)
707708
}

0 commit comments

Comments
 (0)