Merge pull request #160 from alanz/bump-ghcide

alanz · web-flow · commit 26892d6d8fa4 · 2020-06-21T21:33:47.000+01:00
Update to new hls
diff --git a/.gitmodules b/.gitmodules
@@ -11,4 +11,5 @@
 [submodule "ghcide"]
 	path = ghcide
 	# url = https://github.com/digital-asset/ghcide.git
-	url = https://github.com/alanz/ghcide.git
+	# url = https://github.com/alanz/ghcide.git
+	url = https://github.com/wz1000/ghcide.git
diff --git a/cabal.project b/cabal.project
@@ -2,11 +2,6 @@ packages:
          ./
          ghcide
 
-source-repository-package
-    type: git
-    location: https://github.com/wz1000/shake
-    tag: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
-
 -- See https://github.com/haskell-hvr/cabal-plan/pull/55
 source-repository-package
     type: git
@@ -23,4 +18,4 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-05-24T12:28:23Z
+index-state: 2020-06-18T17:03:29Z
diff --git a/exe/Main.hs b/exe/Main.hs
diff --git a/ghcide b/ghcide
@@ -1 +1 @@
-Subproject commit 3ee692a4cdb98792c371765c9f8adb5237d0a515
+Subproject commit 977663126b938cd99c8746150458f9bd1031f01a
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -154,7 +154,7 @@ executable haskell-language-server
      -- which works for now.
     , ghc
      --------------------------------------------------------------
-    , ghc-check >= 0.3.0.1 && < 0.4
+    , ghc-check >= 0.5.0.1 && < 0.6
     , ghc-paths
     , ghcide
     , gitrev
@@ -164,6 +164,7 @@ executable haskell-language-server
     , haskell-language-server
     , hslogger
     , optparse-applicative
+    , safe-exceptions
     , shake >= 0.17.5
     , text
     , time
diff --git a/src/Ide/Plugin/Example.hs b/src/Ide/Plugin/Example.hs
@@ -122,7 +122,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
     logInfo (ideLogger ideState) "Example.codeLens entered (ideLogger)" -- AZ
     case uriToFilePath' uri of
       Just (toNormalizedFilePath -> filePath) -> do
-        _ <- runIdeAction "Example.codeLens" ideState $ runMaybeT $ useE TypeCheck filePath
+        _ <- runIdeAction "Example.codeLens" (shakeExtras ideState) $ runMaybeT $ useE TypeCheck filePath
         _diag <- getDiagnostics ideState
         _hDiag <- getHiddenDiagnostics ideState
         let
diff --git a/src/Ide/Plugin/Example2.hs b/src/Ide/Plugin/Example2.hs
@@ -122,7 +122,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
     logInfo (ideLogger ideState) "Example2.codeLens entered (ideLogger)" -- AZ
     case uriToFilePath' uri of
       Just (toNormalizedFilePath -> filePath) -> do
-        _ <- runIdeAction (fromNormalizedFilePath filePath) ideState $ runMaybeT $ useE TypeCheck filePath
+        _ <- runIdeAction (fromNormalizedFilePath filePath) (shakeExtras ideState) $ runMaybeT $ useE TypeCheck filePath
         _diag <- getDiagnostics ideState
         _hDiag <- getHiddenDiagnostics ideState
         let
diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2020-05-12
+resolver: nightly-2020-06-15
 compiler: ghc-8.10.1
 
 packages:
@@ -7,22 +7,21 @@ packages:
 
 extra-deps:
 - Cabal-3.2.0.0
-- cabal-helper-1.1.0.0
-# See https://github.com/haskell-hvr/cabal-plan/pull/55
-- github: peti/cabal-plan
-  commit: 894b76c0b6bf8f7d2f881431df1f13959a8fce87
+# - cabal-helper-1.1.0.0
+- github: DanielG/cabal-helper
+  commit: 79a5608778493bf32e74b54bbf1ea2729941e50f
+- cabal-plan-0.7.0.0
 - clock-0.7.2
 - floskell-0.10.3
-# - ghcide-0.1.0
 - ghc-exactprint-0.6.3
-- ghc-lib-parser-8.10.1.20200523
 - lens-4.19.1
+- lsp-test-0.11.0.2
 - monad-dijkstra-0.1.1.2
 - optics-core-0.3
-- github: wz1000/shake
-  commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
+- ormolu-0.0.5.0
 - semigroups-0.18.5
 - temporary-1.2.1.1
+- these-1.1
 
 flags:
   haskell-language-server:
@@ -37,4 +36,4 @@ flags:
 nix:
   packages: [ icu libcxx zlib ]
 
-concurrent-tests: false
+concurrent-tests: false
diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
@@ -18,7 +18,7 @@ extra-deps:
 - extra-1.6.21
 - floskell-0.10.3
 - fuzzy-0.1.0.0
-- ghc-check-0.3.0.1
+- ghc-check-0.5.0.1
 - ghc-exactprint-0.6.2 # for HaRe
 - ghc-lib-parser-8.10.1.20200523
 - ghc-lib-parser-ex-8.10.0.4
@@ -36,7 +36,7 @@ extra-deps:
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:1
 - lens-4.18
-- lsp-test-0.10.3.0
+- lsp-test-0.11.0.2
 - microlens-th-0.4.2.3@rev:1
 - monad-dijkstra-0.1.1.2
 - monad-memo-0.4.1
@@ -47,9 +47,9 @@ extra-deps:
 - regex-base-0.94.0.0
 - regex-tdfa-1.3.1.0
 - rope-utf16-splay-0.3.1.0
-# - shake-0.18.5
-- github: wz1000/shake
-  commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
+- shake-0.19.1
+# - github: wz1000/shake
+#   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
 - stylish-haskell-0.11.0.0
 - syz-0.2.0.0
 - tasty-rerun-1.1.17
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.27 # Last 8.6.5 
+resolver: lts-14.27 # Last 8.6.5
 
 packages:
 - .
@@ -17,7 +17,7 @@ extra-deps:
 - floskell-0.10.3
 - fuzzy-0.1.0.0
 # - ghcide-0.1.0
-- ghc-check-0.3.0.1
+- ghc-check-0.5.0.1
 - ghc-lib-parser-8.10.1.20200523
 - ghc-lib-parser-ex-8.10.0.4
 - haddock-api-2.22.0@rev:1
@@ -29,7 +29,7 @@ extra-deps:
 - HsYAML-aeson-0.2.0.0@rev:1
 - indexed-profunctors-0.1
 - lens-4.18
-- lsp-test-0.10.3.0
+- lsp-test-0.11.0.2
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.0
 - optics-core-0.2
@@ -40,8 +40,8 @@ extra-deps:
 - regex-pcre-builtin-0.95.1.1.8.43
 - regex-tdfa-1.3.1.0
 - semialign-1.1
-- github: wz1000/shake
-  commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
+# - github: wz1000/shake
+#   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
 - stylish-haskell-0.11.0.0
 - tasty-rerun-1.1.17
 - temporary-1.2.1.1
diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml
@@ -12,7 +12,7 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.3
 # - ghcide-0.1.0
-- ghc-check-0.3.0.1
+- ghc-check-0.5.0.1
 - ghc-lib-parser-8.10.1.20200523
 - ghc-lib-parser-ex-8.10.0.4
 - haddock-library-1.8.0
@@ -26,13 +26,13 @@ extra-deps:
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:1
 - ilist-0.3.1.0
-- lsp-test-0.10.3.0
+- lsp-test-0.11.0.2
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.0
 - ormolu-0.0.5.0
 - semigroups-0.18.5
-- github: wz1000/shake
-  commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
+# - github: wz1000/shake
+#   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
 - stylish-haskell-0.11.0.0
 - temporary-1.2.1.1
 
diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -12,7 +12,7 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.3
 # - ghcide-0.1.0
-- ghc-check-0.3.0.1
+- ghc-check-0.5.0.1
 - ghc-lib-parser-8.10.1.20200523
 - ghc-lib-parser-ex-8.10.0.4
 - haskell-lsp-0.22.0.0
@@ -23,13 +23,13 @@ extra-deps:
 - hoogle-5.0.17.11
 - hsimport-0.11.0
 - ilist-0.3.1.0
-- lsp-test-0.10.3.0
+- lsp-test-0.11.0.2
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.0
 - ormolu-0.0.5.0
 - semigroups-0.18.5
-- github: wz1000/shake
-  commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
+# - github: wz1000/shake
+#   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
 - stylish-haskell-0.11.0.0
 - temporary-1.2.1.1
 
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.27 # Last 8.6.5 
+resolver: lts-14.27 # Last 8.6.5
 
 packages:
 - .
@@ -14,10 +14,10 @@ extra-deps:
 - cabal-plan-0.6.2.0
 - clock-0.7.2
 - extra-1.7.1
-- floskell-0.10.2
+- floskell-0.10.3
 - fuzzy-0.1.0.0
 # - ghcide-0.1.0
-- ghc-check-0.3.0.1
+- ghc-check-0.5.0.1
 - ghc-lib-parser-8.10.1.20200523
 - ghc-lib-parser-ex-8.10.0.4
 - haddock-api-2.22.0@rev:1
@@ -29,7 +29,7 @@ extra-deps:
 - HsYAML-aeson-0.2.0.0@rev:1
 - indexed-profunctors-0.1
 - lens-4.18
-- lsp-test-0.10.3.0
+- lsp-test-0.11.0.2
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.0
 - optics-core-0.2
@@ -40,8 +40,8 @@ extra-deps:
 - regex-pcre-builtin-0.95.1.1.8.43
 - regex-tdfa-1.3.1.0
 - semialign-1.1
-- github: wz1000/shake
-  commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
+# - github: wz1000/shake
+#   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
 - stylish-haskell-0.11.0.0
 - tasty-rerun-1.1.17
 - temporary-1.2.1.1
