Skip to content
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

Bump ghcide to wz1000 hls-2 branch #184

Merged
merged 3 commits into from
Jul 5, 2020
Merged

Bump ghcide to wz1000 hls-2 branch #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3436f6a
Bump ghcide to wz1000 hls-2 branch
alanz Jul 1, 2020
f5d3c24
Remove commented out package.
alanz Jul 1, 2020
5b17547
Fix conflict with cabal.project, and clean compilation
alanz Jul 5, 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
8 changes: 1 addition & 7 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ packages:
./
ghcide

-- See https://github.com/haskell-hvr/cabal-plan/pull/55
source-repository-package
type: git
location: https://github.com/peti/cabal-plan
tag: 894b76c0b6bf8f7d2f881431df1f13959a8fce87

tests: true
documentation: true

Expand All @@ -18,4 +12,4 @@ package ghcide

write-ghc-environment-files: never

index-state: 2020-06-18T17:03:29Z
index-state: 2020-07-01T21:29:04Z
4 changes: 2 additions & 2 deletions exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ loadSession dir = do
InstallationMismatch{..} ->
return $ returnWithVersion $ \fp -> return (([renderPackageSetupException compileTime fp GhcVersionMismatch{..}], Nothing),[])
InstallationChecked compileTime ghcLibCheck -> return $ do
ShakeExtras{logger, eventer, restartShakeSession, withIndefiniteProgress, ideNc, session=ideSession} <- getShakeExtras
ShakeExtras{logger, eventer, withIndefiniteProgress, ideNc, session=ideSession} <- getShakeExtras
IdeOptions{optTesting = IdeTesting optTesting} <- getIdeOptions

-- Create a new HscEnv from a hieYaml root and a set of options
Expand Down Expand Up @@ -433,7 +433,7 @@ loadSession dir = do

-- Invalidate all the existing GhcSession build nodes by restarting the Shake session
invalidateShakeCache
restartShakeSession [kick]
-- restartShakeSession [kick]

return (map fst cs, second Map.keys res)

Expand Down
2 changes: 1 addition & 1 deletion ghcide
Open in desktop
Submodule ghcide updated 27 files
+5 −3 README.md
+2 −2 bench/exe/Main.hs
+2 −2 bench/hist.yaml
+11 −11 bench/hist/Main.hs
+0 −2 bench/lib/Experiments.hs
+1 −1 fmt.sh
+7 −9 ghcide.cabal
+3 −3 hie.yaml
+2 −2 hie.yaml.stack
+1 −0 src-ghc810/Development/IDE/GHC/HieBin.hs
+1 −0 src-ghc88/Development/IDE/GHC/HieBin.hs
+1 −4 src/Development/IDE/Core/Compile.hs
+5 −1 src/Development/IDE/Core/FileStore.hs
+13 −3 src/Development/IDE/Core/RuleTypes.hs
+51 −21 src/Development/IDE/Core/Rules.hs
+16 −25 src/Development/IDE/Core/Shake.hs
+23 −9 src/Development/IDE/GHC/Compat.hs
+5 −0 src/Development/IDE/GHC/Orphans.hs
+168 −3 src/Development/IDE/Plugin/CodeAction.hs
+3 −1 stack-ghc-lib.yaml
+6 −0 test/data/TH/THA.hs
+6 −0 test/data/TH/THB.hs
+5 −0 test/data/TH/THC.hs
+1 −0 test/data/TH/hie.yaml
+1 −0 test/data/hover/Bar.hs
+2 −1 test/data/hover/Foo.hs
+258 −5 test/exe/Main.hs
6 changes: 3 additions & 3 deletions stack-8.10.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
resolver: nightly-2020-06-15
compiler: ghc-8.10.1
resolver: nightly-2020-06-29

packages:
- .
- ./ghcide/

extra-deps:
- Cabal-3.2.0.0
- Cabal-3.0.2.0
# - cabal-helper-1.1.0.0
- github: DanielG/cabal-helper
commit: 79a5608778493bf32e74b54bbf1ea2729941e50f
Expand All @@ -19,6 +18,7 @@ extra-deps:
- monad-dijkstra-0.1.1.2
- optics-core-0.3
- ormolu-0.0.5.0
- stylish-haskell-0.11.0.0
- semigroups-0.18.5
- temporary-1.2.1.1
- these-1.1
Expand Down
3 changes: 2 additions & 1 deletion stack-8.8.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-15.12
resolver: lts-16.3

packages:
- .
Expand All @@ -8,6 +8,7 @@ extra-deps:
- apply-refact-0.7.0.0
- bytestring-trie-0.2.5.0
- cabal-helper-1.1.0.0
- cabal-plan-0.6.2.0
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- extra-1.7.3
Expand Down