Merge pull request #184 from alanz/bump-ghcide

Bump ghcide to wz1000 hls-2 branch
haskell · Jul 5, 2020 · d0623b2 · d0623b2
2 parents 77c31c3 + 5b17547
commit d0623b2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/exe/Main.hs b/exe/Main.hs
@@ -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
@@ -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)
 

diff --git a/ghcide b/ghcide
diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml
@@ -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
@@ -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

diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -1,4 +1,4 @@
-resolver: lts-15.12
+resolver: lts-16.3
 
 packages:
 - .
@@ -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
+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