diff --git a/ghcide b/ghcide index d76fbf9a5c..dcf6804027 160000 --- a/ghcide +++ b/ghcide @@ -1 +1 @@ -Subproject commit d76fbf9a5cb34312d8f13c3a908cc98779284313 +Subproject commit dcf680402722e7660377bf7da3fca27c2bde988f diff --git a/plugins/default/src/Ide/Plugin/Eval.hs b/plugins/default/src/Ide/Plugin/Eval.hs index 2da1e7386f..28a16f383e 100644 --- a/plugins/default/src/Ide/Plugin/Eval.hs +++ b/plugins/default/src/Ide/Plugin/Eval.hs @@ -176,7 +176,7 @@ runEvalCmd lsp state EvalParams {..} = withIndefiniteProgress lsp "Eval" Cancell toNormalizedFilePath' $ fp - ms <- + (ms, _) <- liftIO $ runAction "runEvalCmd.getModSummary" state $ use_ GetModSummary $ diff --git a/plugins/default/src/Ide/Plugin/Retrie.hs b/plugins/default/src/Ide/Plugin/Retrie.hs index ebfee268cc..ffb3591730 100644 --- a/plugins/default/src/Ide/Plugin/Retrie.hs +++ b/plugins/default/src/Ide/Plugin/Retrie.hs @@ -360,7 +360,7 @@ callRetrie state session rewrites origin restrictToOriginatingFile = do getCPPmodule t = do nt <- toNormalizedFilePath' <$> makeAbsolute t let getParsedModule f contents = do - modSummary <- + (modSummary, _) <- useOrFail "GetModSummary" (CallRetrieInternalError "file not found") GetModSummary nt let ms' = modSummary diff --git a/plugins/tactics/src/Ide/Plugin/Tactic.hs b/plugins/tactics/src/Ide/Plugin/Tactic.hs index 206bf8eb2c..41deaa7eb6 100644 --- a/plugins/tactics/src/Ide/Plugin/Tactic.hs +++ b/plugins/tactics/src/Ide/Plugin/Tactic.hs @@ -247,7 +247,7 @@ judgementForHole state nfp range = do -- Ok to use the stale 'ModIface', since all we need is its 'DynFlags' -- which don't change very often. - (modsum, _) <- MaybeT $ runIde state $ useWithStale GetModSummaryWithoutTimestamps nfp + ((modsum,_), _) <- MaybeT $ runIde state $ useWithStale GetModSummaryWithoutTimestamps nfp let dflags = ms_hspp_opts modsum (rss, goal) <- liftMaybe $ join $ listToMaybe $ M.elems $ flip M.mapWithKey (getAsts $ hieAst asts) $ \fs ast -> diff --git a/plugins/tactics/src/Ide/Plugin/Tactic/Types.hs b/plugins/tactics/src/Ide/Plugin/Tactic/Types.hs index 95e80f004f..9d08934e94 100644 --- a/plugins/tactics/src/Ide/Plugin/Tactic/Types.hs +++ b/plugins/tactics/src/Ide/Plugin/Tactic/Types.hs @@ -32,6 +32,7 @@ import Data.Map (Map) import Data.Set (Set) import Data.Tree import Development.IDE.GHC.Compat hiding (Node) +import Development.IDE.GHC.Orphans () import Development.IDE.Types.Location import GHC.Generics import Ide.Plugin.Tactic.Debug @@ -65,9 +66,6 @@ instance Show Var where instance Show TCvSubst where show = unsafeRender -instance Show (LHsExpr GhcPs) where - show = unsafeRender - instance Show DataCon where show = unsafeRender