Use haskell-lsp-12.1.0 from hackage

.gitmodules

@@ -31,6 +31,3 @@
 	# url = https://github.com/bubba/ghc-mod.git
 	url = https://github.com/alanz/ghc-mod.git
 
-[submodule "submodules/haskell-lsp"]
-	path = submodules/haskell-lsp
-	url = https://github.com/alanz/haskell-lsp.git

cabal.project

@@ -8,7 +8,5 @@ packages:
          ./submodules/ghc-mod/
          ./submodules/ghc-mod/core/
          ./submodules/ghc-mod/ghc-project-types
-         ./submodules/haskell-lsp
-         ./submodules/haskell-lsp/haskell-lsp-types
 
 tests: true

stack-8.2.1.yaml

@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 # - brittany-0.11.0.0
 - butcher-1.3.1.1
@@ -22,8 +20,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.18.1
 - haddock-library-1.4.4
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - hlint-2.0.11
 - hsimport-0.8.8
 - lsp-test-0.5.2.2

stack-8.2.2.yaml

@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 # - brittany-0.11.0.0
 - butcher-1.3.1.1
@@ -23,8 +21,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.18.1
 - haddock-library-1.4.4
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17

stack-8.4.2.yaml

@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 # - brittany-0.11.0.0
 - base-compat-0.9.3
@@ -21,8 +19,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.20.0
 - haddock-library-1.6.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17

stack-8.4.3.yaml

@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - base-compat-0.9.3
 - cabal-plan-0.3.0.0
@@ -20,8 +18,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.20.0
 - haddock-library-1.6.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17

stack-8.4.4.yaml

@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 # - brittany-0.11.0.0
 - cabal-plan-0.4.0.0
@@ -20,8 +18,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.20.0
 - haddock-library-1.6.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17

stack-8.6.1.yaml

@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - apply-refact-0.6.0.0
 - butcher-1.3.2.1
@@ -22,8 +20,8 @@ extra-deps:
 - data-tree-print-0.1.0.2
 - floskell-0.10.0
 - haddock-api-2.21.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17

stack-8.6.2.yaml

@@ -10,16 +10,14 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - butcher-1.3.2.1
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - haddock-api-2.21.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17

stack-8.6.3.yaml

@@ -10,16 +10,14 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - butcher-1.3.2.1
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - haddock-api-2.21.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17

stack-8.6.4.yaml

@@ -10,16 +10,14 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - butcher-1.3.2.1
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - haddock-api-2.22.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - hlint-2.1.17
 - hoogle-5.0.17.6

stack-8.6.5.yaml

@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - ansi-terminal-0.8.2
 - butcher-1.3.2.1
@@ -21,8 +19,8 @@ extra-deps:
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.22.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - hlint-2.1.17
 - hsimport-0.8.8
 - lsp-test-0.5.2.2

stack.yaml

@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - ansi-terminal-0.8.2
 - butcher-1.3.2.1
@@ -21,8 +19,8 @@ extra-deps:
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.22.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - hlint-2.1.17
 - hsimport-0.8.8
 - lsp-test-0.5.2.2

test/functional/DeferredSpec.hs

@@ -29,7 +29,7 @@ spec = do
 
       skipMany anyNotification
       hoverRsp <- message :: Session HoverResponse
-      liftIO $ hoverRsp ^? result . _Just . _Just . contents `shouldBe` (Just HoverContentsEmpty)
+      liftIO $ hoverRsp ^? result . _Just . _Just . contents `shouldBe` Nothing
       liftIO $ hoverRsp ^. LSP.id `shouldBe` responseId id1
 
       id2 <- sendRequest TextDocumentDocumentSymbol (DocumentSymbolParams doc)