Merge branch 'master' of https://github.com/Bubba/haskell-lsp-test

diff --cc haskell-lsp-test.cabal
Simple merge

diff --cc src/Language/Haskell/LSP/Test.hs
index b2d731e675cd897de03008106bbcb316bf5253bc,7f13a59e111a4e93e63d60198b165a43388bd1db..48869b4b4d640c81aa3d39adf87cb6356caee44a
--- 1/src/Language/Haskell/LSP/Test.hs
--- 2/src/Language/Haskell/LSP/Test.hs
+++ b/src/Language/Haskell/LSP/Test.hs
@@@ -71,10 -72,13 +72,11 @@@ import qualified Data.Text.IO as 
  import Data.Aeson
  import qualified Data.ByteString.Lazy.Char8 as B
  import Data.Default
 -import Data.Foldable
 -import qualified Data.HashMap.Strict as HashMap
 -import Data.List
 +import qualified Data.Map as Map
 +import Data.Maybe
  import Language.Haskell.LSP.Types
  import qualified  Language.Haskell.LSP.Types as LSP (error, id)
 -import Language.Haskell.LSP.Messages
+ import Language.Haskell.LSP.TH.ClientCapabilities
  import Language.Haskell.LSP.VFS
  import Language.Haskell.LSP.Test.Compat
  import Language.Haskell.LSP.Test.Decoding

diff --cc test/Test.hs
Simple merge