@@ -246,21 +246,21 @@ runEvalCmd plId st EvalParams{..} =
246
246
-- also be loaded into the environment.
247
247
--
248
248
-- The interactive context and interactive dynamic flags are also set appropiately.
249
- initialiseSessionForEval :: Bool -> IdeState -> NormalizedFilePath -> ExceptT PluginError ( LspM Config ) HscEnv
249
+ initialiseSessionForEval :: Bool -> IdeState -> NormalizedFilePath -> IO HscEnv
250
250
initialiseSessionForEval needs_quickcheck st nfp = do
251
- (ms, env1) <- runActionE " runEvalCmd" st $ do
251
+ (ms, env1) <- runAction " runEvalCmd" st $ do
252
252
253
- ms <- msrModSummary <$> useE GetModSummary nfp
254
- deps_hsc <- hscEnv <$> useE GhcSessionDeps nfp
253
+ ms <- msrModSummary <$> use_ GetModSummary nfp
254
+ deps_hsc <- hscEnv <$> use_ GhcSessionDeps nfp
255
255
256
256
linkables_needed <- transitiveDeps <$> useNoFile_ GetModuleGraph <*> pure nfp
257
- linkables <- usesE GetLinkable (nfp : maybe [] transitiveModuleDeps linkables_needed)
257
+ linkables <- uses_ GetLinkable (nfp : maybe [] transitiveModuleDeps linkables_needed)
258
258
-- We unset the global rdr env in mi_globals when we generate interfaces
259
259
-- See Note [Clearing mi_globals after generating an iface]
260
260
-- However, the eval plugin (setContext specifically) requires the rdr_env
261
261
-- for the current module - so get it from the Typechecked Module and add
262
262
-- it back to the iface for the current module.
263
- rdr_env <- tcg_rdr_env . tmrTypechecked <$> useE TypeCheck nfp
263
+ rdr_env <- tcg_rdr_env . tmrTypechecked <$> use_ TypeCheck nfp
264
264
let linkable_hsc = loadModulesHome (map (addRdrEnv . linkableHomeMod) linkables) deps_hsc
265
265
addRdrEnv hmi
266
266
| iface <- hm_iface hmi
0 commit comments