Skip to content

Commit 16aceaf

Browse files
authored
Merge pull request #568 from jneira/ghcide-master
Bump up ghcide submodule to version 0.5.0
2 parents 05ee76d + 59695c2 commit 16aceaf

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

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

+1-1
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

+1-1
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

+1-1
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

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import Data.Map (Map)
3232
import Data.Set (Set)
3333
import Data.Tree
3434
import Development.IDE.GHC.Compat hiding (Node)
35+
import Development.IDE.GHC.Orphans ()
3536
import Development.IDE.Types.Location
3637
import GHC.Generics
3738
import Ide.Plugin.Tactic.Debug
@@ -65,9 +66,6 @@ instance Show Var where
6566
instance Show TCvSubst where
6667
show = unsafeRender
6768

68-
instance Show (LHsExpr GhcPs) where
69-
show = unsafeRender
70-
7169
instance Show DataCon where
7270
show = unsafeRender
7371

0 commit comments

Comments
 (0)