Skip to content

Bump up ghcide submodule to version 0.5.0 #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 8, 2020
Merged

Bump up ghcide submodule to version 0.5.0 #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3342079
Bump up ghcide submodule to e922a1
jneira Nov 4, 2020
741e667
Adapt plugins to ghcide api changes
jneira Nov 4, 2020
056bd41
Update ghcide to 0.5.0 release
jneira Nov 7, 2020
59695c2
Remove unused instance using Orphans
jneira Nov 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ghcide
Open in desktop
Submodule ghcide updated 25 files
+0 −49 .azure/linux-bench.yml
+62 −0 .github/workflows/bench.yml
+24 −0 CHANGELOG.md
+0 −1 azure-pipelines.yml
+1 −1 bench/config.yaml
+6 −6 bench/hist/Main.hs
+4 −0 cabal.project
+5 −5 ghcide.cabal
+3 −3 session-loader/Development/IDE/Session.hs
+84 −104 src/Development/IDE/Core/Compile.hs
+0 −1 src/Development/IDE/Core/Preprocessor.hs
+2 −2 src/Development/IDE/Core/RuleTypes.hs
+37 −47 src/Development/IDE/Core/Rules.hs
+0 −1 src/Development/IDE/GHC/CPP.hs
+14 −30 src/Development/IDE/GHC/Compat.hs
+4 −1 src/Development/IDE/GHC/Orphans.hs
+0 −1 src/Development/IDE/GHC/Util.hs
+5 −6 src/Development/IDE/Plugin/CodeAction.hs
+11 −34 src/Development/IDE/Plugin/Completions.hs
+7 −26 src/Development/IDE/Plugin/Completions/Logic.hs
+1 −1 src/Development/IDE/Spans/Common.hs
+1 −1 stack.yaml
+1 −1 stack810.yaml
+1 −1 stack8101.yaml
+1 −1 stack88.yaml
2 changes: 1 addition & 1 deletion plugins/default/src/Ide/Plugin/Eval.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ runEvalCmd lsp state EvalParams {..} = withIndefiniteProgress lsp "Eval" Cancell
toNormalizedFilePath' $
fp

ms <-
(ms, _) <-
liftIO $
runAction "runEvalCmd.getModSummary" state $
use_ GetModSummary $
Expand Down
2 changes: 1 addition & 1 deletion plugins/default/src/Ide/Plugin/Retrie.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/tactics/src/Ide/Plugin/Tactic.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down
4 changes: 1 addition & 3 deletions plugins/tactics/src/Ide/Plugin/Tactic/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down