Skip to content

Commit d98918c

Browse files
committed
Fix
1 parent e75c63d commit d98918c

File tree

1 file changed

+4
-3
lines changed
  • ghcide/src/Development/IDE/Plugin

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ extensiblePlugins recorder xs = mempty { P.pluginHandlers = handlers }
216216
let msg e pid = "Exception in plugin " <> T.pack (show pid) <> " while processing " <> T.pack (show m) <> ": " <> T.pack (show e)
217217
handlers = fmap (\(plid,_,handler) -> (plid,handler)) fs
218218
es <- runConcurrently msg (show m) handlers ide params
219-
let (errs,succs) = partitionEithers $ toList $ NE.zipWith (\(pId,_) -> first (pId,)) handlers es
219+
220+
let (errs,succs) = partitionEithers $ toList $ join $ NE.zipWith (\(pId,_) -> fmap (first (pId,))) handlers es
220221
unless (null errs) $ forM_ errs $ \(pId, err) ->
221222
logWith recorder Warning $ LogPluginError pId err
222223
case nonEmpty succs of
@@ -260,8 +261,8 @@ runConcurrently
260261
-- ^ Enabled plugin actions that we are allowed to run
261262
-> a
262263
-> b
263-
-> m (NonEmpty (Either ResponseError d))
264-
runConcurrently msg method fs a b = fmap join $ forConcurrently fs $ \(pid,f) -> otTracedProvider pid (fromString method) $ do
264+
-> m (NonEmpty(NonEmpty (Either ResponseError d)))
265+
runConcurrently msg method fs a b = forConcurrently fs $ \(pid,f) -> otTracedProvider pid (fromString method) $ do
265266
f a b
266267
`catchAny` (\e -> pure $ pure $ Left $ ResponseError InternalError (msg e pid) Nothing)
267268

0 commit comments

Comments
 (0)