Merge branch 'master' of https://github.com/haskell/haskell-language-server into doc/testHlsInEditor

Author: sir4ur0n

.gitignore

@@ -1,6 +1,7 @@
 dist-newstyle
 .stack-work
 /hie.yaml
+/install/hie.yaml
 cabal.project.local
 *~
 *.lock

shell.nix

@@ -16,7 +16,9 @@
 #    assuming that cabal new-build does succeed outside nix-shell
 
 { sources ? import nix/sources.nix,
-  nixpkgs ? import sources.nixpkgs {},
+  # TODO Remove allowBroken once retrie is no longer marked as broken in Nixpkgs
+  # See https://github.com/haskell/haskell-language-server/issues/325
+  nixpkgs ? import sources.nixpkgs { config.allowBroken = true; },
   compiler ? "default",
   hoogle ? false
  }:

stack.yaml

@@ -10,7 +10,7 @@ ghc-options:
 extra-deps:
 - aeson-1.5.2.0
 - ansi-terminal-0.10.3
-- base-compat-0.11.0
+- base-compat-0.10.5
 - github: bubba/brittany
   commit: c59655f10d5ad295c2481537fc8abf0a297d9d1c
 - butcher-1.3.3.1
@@ -42,14 +42,18 @@ extra-deps:
 - optparse-applicative-0.15.1.0
 - ormolu-0.1.2.0
 - parser-combinators-1.2.1
+- primitive-0.7.1.0
 - regex-base-0.94.0.0
 - regex-pcre-builtin-0.95.1.1.8.43
 - regex-tdfa-1.3.1.0
 - retrie-0.1.1.1
 - semialign-1.1
+# - github: wz1000/shake
+#   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
 - stylish-haskell-0.11.0.3
 - tasty-rerun-1.1.17
 - temporary-1.2.1.1
+- these-1.1.1.1
 - type-equality-1
 - topograph-1