Update to use LSP from github (#1662)

* Update to use LSP from github

* Switch to upstream LSP everywhere

WORKSPACE

@@ -443,9 +443,9 @@ load("@bazel_skylib//lib:dicts.bzl", "dicts")
 # For the time being we build with GMP. See https://github.com/digital-asset/daml/issues/106
 use_integer_simple = not is_windows
 
-HASKELL_LSP_COMMIT = "fc239a1289159e36c746079c7a1843361d32ddd9"
+HASKELL_LSP_COMMIT = "d73e2ccb518724e6766833ee3d7e73289cbe0018"
 
-HASKELL_LSP_HASH = "3c97ae3da090c897c4ddef07c2b5c18442fd52a2ed08bc4779ec6084c5399a17"
+HASKELL_LSP_HASH = "36b92431039e6289eb709b8872f5010a57d4a45e637e1c1c945bdb3128586081"
 
 hazel_repositories(
     core_packages = dicts.add(
@@ -509,12 +509,14 @@ hazel_repositories(
             hazel_hackage("unix-compat", "0.5.1", "a39d0c79dd906763770b80ba5b6c5cb710e954f894350e9917de0d73f3a19c52") +
             # This corresponds to our normalize-uri branch that enforces a consistent
             # precent-encoding for URIs used as keys.
-            hazel_github(
+            hazel_github_external(
+                "alanz",
                 "haskell-lsp",
                 HASKELL_LSP_COMMIT,
                 HASKELL_LSP_HASH,
             ) +
-            hazel_github(
+            hazel_github_external(
+                "alanz",
                 "haskell-lsp",
                 HASKELL_LSP_COMMIT,
                 HASKELL_LSP_HASH,

compiler/haskell-ide-core/stack.yaml

@@ -1,3 +1,10 @@
 resolver: nightly-2019-05-20
 packages:
 - .
+
+extra-deps:
+- git: https://github.com/alanz/haskell-lsp.git
+  commit: d73e2ccb518724e6766833ee3d7e73289cbe0018
+  subdirs:
+  - .
+  - haskell-lsp-types