Merge pull request #57 from alanz/multi-experimental

Experimenting with the WIP multi ghcide branch

Author: alanz

.gitmodules

@@ -10,5 +10,5 @@
 #     rm -rf path_to_submodule
 [submodule "ghcide"]
 	path = ghcide
-	url = https://github.com/digital-asset/ghcide.git
-	# url = https://github.com/alanz/ghcide.git
+	# url = https://github.com/digital-asset/ghcide.git
+	url = https://github.com/alanz/ghcide.git

cabal.project

@@ -8,6 +8,8 @@ source-repository-package
     tag: a18bbb2af92e9b4337e7f930cb80754f2408bcfd
 
 tests: true
+documentation: false
+-- documentation: true
 
 package haskell-language-server
   test-show-details: direct
@@ -16,4 +18,4 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-03-03T21:14:55Z
+index-state: 2020-03-24T21:15:10Z

exe/Main.hs

@@ -27,7 +27,6 @@ source-repository head
 
 library
   exposed-modules:
-      Ide.Compat
       Ide.Cradle
       Ide.Logger
       Ide.Plugin
@@ -63,7 +62,7 @@ library
     , ghcide >= 0.1
     , gitrev
     , hashable
-    , haskell-lsp == 0.20.*
+    , haskell-lsp == 0.21.*
     , hie-bios >= 0.4
     , hslogger
     , lens
@@ -97,8 +96,6 @@ executable haskell-language-server
   other-modules:
       Arguments
       Paths_haskell_language_server
-      Rules
-      RuleTypes
   autogen-modules:
       Paths_haskell_language_server
   ghc-options:
@@ -125,6 +122,7 @@ executable haskell-language-server
     , containers
     , data-default
     , deepseq
+    , directory
     , extra
     , filepath
      --------------------------------------------------------------
@@ -135,6 +133,7 @@ executable haskell-language-server
      -- which works for now.
     , ghc
      --------------------------------------------------------------
+    , ghc-check
     , ghc-paths
     , ghcide
     , gitrev
@@ -146,6 +145,7 @@ executable haskell-language-server
     , optparse-applicative
     , shake >= 0.17.5
     , text
+    , time
     , unordered-containers
   default-language: Haskell2010