update lsp lib version to master

we should use version from hackage before this is merged
haskell · Jan 10, 2022 · 55c2d5e · 55c2d5e
1 parent 85d0ddb
commit 55c2d5e
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 21 deletions.
diff --git a/cabal.project b/cabal.project
@@ -40,10 +40,22 @@ package *
 
 source-repository-package
     type: git
-    location: https://github.com/kokobd/lsp.git
-    tag: 1ee82f3fb1539350b2726b9b2d979abd9081ec7a
+    location: https://github.com/haskell/lsp.git
+    tag: bad3d45854e5ca4eaf53985e9cee42d25840d18a
     subdir: lsp-types
 
+source-repository-package
+    type: git
+    location: https://github.com/haskell/lsp.git
+    tag: bad3d45854e5ca4eaf53985e9cee42d25840d18a
+    subdir: lsp
+
+source-repository-package
+    type: git
+    location: https://github.com/haskell/lsp.git
+    tag: bad3d45854e5ca4eaf53985e9cee42d25840d18a
+    subdir: lsp-test
+
 write-ghc-environment-files: never
 
 index-state: 2021-12-29T12:30:08Z

diff --git a/ghcide/src/Development/IDE/Plugin/SelectionRange.hs b/ghcide/src/Development/IDE/Plugin/SelectionRange.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE RankNTypes #-}
 module Development.IDE.Plugin.SelectionRange
     ( descriptor
     ) where

diff --git a/stack-8.10.6.yaml b/stack-8.10.6.yaml
@@ -44,9 +44,12 @@ extra-deps:
   - hiedb-0.4.1.0
   - implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998
   - implicit-hie-cradle-0.3.0.5@sha256:5f5e575f549b2a9db664be7650b5c3c9226e313bddc46c79e2e83eb349f8e692,2610
-  - lsp-1.4.0.0
-  - lsp-test-0.14.0.2
-  - lsp-types-1.4.0.0
+  - git: https://github.com/haskell/lsp.git
+    commit: bad3d45854e5ca4eaf53985e9cee42d25840d18a
+    subdirs:
+      - lsp
+      - lsp-types
+      - lsp-test
   - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900
   - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810
   - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663

diff --git a/stack-8.10.7.yaml b/stack-8.10.7.yaml
@@ -45,9 +45,12 @@ extra-deps:
   - hiedb-0.4.1.0
   - implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998
   - implicit-hie-cradle-0.3.0.5@sha256:5f5e575f549b2a9db664be7650b5c3c9226e313bddc46c79e2e83eb349f8e692,2610
-  - lsp-1.4.0.0
-  - lsp-test-0.14.0.2
-  - lsp-types-1.4.0.0
+  - git: https://github.com/haskell/lsp.git
+    commit: bad3d45854e5ca4eaf53985e9cee42d25840d18a
+    subdirs:
+      - lsp
+      - lsp-types
+      - lsp-test
   - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900
   - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810
   - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663

diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -103,9 +103,12 @@ extra-deps:
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - resourcet-1.2.3
-  - lsp-1.4.0.0
-  - lsp-test-0.14.0.2
-  - lsp-types-1.4.0.0
+  - git: https://github.com/haskell/lsp.git
+    commit: bad3d45854e5ca4eaf53985e9cee42d25840d18a
+    subdirs:
+      - lsp
+      - lsp-types
+      - lsp-test
   - mod-0.1.2.2
   - semirings-0.6
   - stm-containers-1.1.0.4

diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -79,9 +79,12 @@ extra-deps:
   - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
-  - lsp-1.4.0.0
-  - lsp-test-0.14.0.2
-  - lsp-types-1.4.0.0
+  - git: https://github.com/haskell/lsp.git
+    commit: bad3d45854e5ca4eaf53985e9cee42d25840d18a
+    subdirs:
+      - lsp
+      - lsp-types
+      - lsp-test
   - stm-containers-1.1.0.4
   - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972
   - primitive-extras-0.10.1

diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml
@@ -45,9 +45,12 @@ extra-deps:
 - implicit-hie-cradle-0.3.0.5
 - monad-dijkstra-0.1.1.3
 - retrie-1.1.0.0
-- lsp-1.4.0.0
-- lsp-test-0.14.0.2
-- lsp-types-1.4.0.0
+- git: https://github.com/haskell/lsp.git
+  commit: bad3d45854e5ca4eaf53985e9cee42d25840d18a
+  subdirs:
+    - lsp
+    - lsp-types
+    - lsp-test
 
 # shake-bench dependencies
 - Chart-1.9.3

diff --git a/stack.yaml b/stack.yaml
@@ -45,9 +45,12 @@ extra-deps:
   - hiedb-0.4.1.0
   - implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998
   - implicit-hie-cradle-0.3.0.5@sha256:5f5e575f549b2a9db664be7650b5c3c9226e313bddc46c79e2e83eb349f8e692,2610
-  - lsp-1.4.0.0
-  - lsp-test-0.14.0.2
-  - lsp-types-1.4.0.0
+  - git: https://github.com/haskell/lsp.git
+    commit: bad3d45854e5ca4eaf53985e9cee42d25840d18a
+    subdirs:
+      - lsp
+      - lsp-types
+      - lsp-test
   - monad-dijkstra-0.1.1.3@sha256:d2fc098d7c122555e726830a12ae0423ac187f89de9228f32e56e2f6fc2238e1,1900
   - optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810
   - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663