From: Luke Lau <luke_lau@icloud.com>
Date: Wed, 20 Jun 2018 16:41:51 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Bubba/haskell-lsp-test
X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=commitdiff_plain;h=f6e14409afddc74ea8ffb1d852c316a5374caf2c

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

f6e14409afddc74ea8ffb1d852c316a5374caf2c
diff --cc src/Language/Haskell/LSP/Test.hs
index b2d731e,7f13a59..48869b4
--- a/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.TH.ClientCapabilities
 -import Language.Haskell.LSP.Messages
  import Language.Haskell.LSP.VFS
  import Language.Haskell.LSP.Test.Compat
  import Language.Haskell.LSP.Test.Decoding