Skip to content

Commit 741e667

Browse files
committed
Adapt plugins to ghcide api changes
1 parent 3342079 commit 741e667

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

plugins/default/src/Ide/Plugin/Eval.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ runEvalCmd lsp state EvalParams {..} = withIndefiniteProgress lsp "Eval" Cancell
176176
toNormalizedFilePath' $
177177
fp
178178

179-
ms <-
179+
(ms, _) <-
180180
liftIO $
181181
runAction "runEvalCmd.getModSummary" state $
182182
use_ GetModSummary $

plugins/default/src/Ide/Plugin/Retrie.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ callRetrie state session rewrites origin restrictToOriginatingFile = do
360360
getCPPmodule t = do
361361
nt <- toNormalizedFilePath' <$> makeAbsolute t
362362
let getParsedModule f contents = do
363-
modSummary <-
363+
(modSummary, _) <-
364364
useOrFail "GetModSummary" (CallRetrieInternalError "file not found") GetModSummary nt
365365
let ms' =
366366
modSummary

plugins/tactics/src/Ide/Plugin/Tactic.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ judgementForHole state nfp range = do
247247

248248
-- Ok to use the stale 'ModIface', since all we need is its 'DynFlags'
249249
-- which don't change very often.
250-
(modsum, _) <- MaybeT $ runIde state $ useWithStale GetModSummaryWithoutTimestamps nfp
250+
((modsum,_), _) <- MaybeT $ runIde state $ useWithStale GetModSummaryWithoutTimestamps nfp
251251
let dflags = ms_hspp_opts modsum
252252

253253
(rss, goal) <- liftMaybe $ join $ listToMaybe $ M.elems $ flip M.mapWithKey (getAsts $ hieAst asts) $ \fs ast ->

plugins/tactics/src/Ide/Plugin/Tactic/Types.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ instance Show Var where
6565
instance Show TCvSubst where
6666
show = unsafeRender
6767

68-
instance Show (LHsExpr GhcPs) where
68+
instance {-# OVERLAPPING #-} Show (LHsExpr GhcPs) where
6969
show = unsafeRender
7070

7171
instance Show DataCon where

0 commit comments

Comments
 (0)