From f8ee63f1c1d245c16f7a928c14c0e8908e6240c8 Mon Sep 17 00:00:00 2001
From: Luke Lau <luke_lau@icloud.com>
Date: Mon, 9 Jul 2018 01:16:52 +0100
Subject: [PATCH] Tidy up and remove redundant classes and tests

---
 haskell-lsp-test.cabal                   |  1 -
 src/Language/Haskell/LSP/Test.hs         |  1 -
 src/Language/Haskell/LSP/Test/Session.hs |  7 ----
 test/ParsingTests.hs                     | 44 ------------------------
 test/Test.hs                             |  3 --
 5 files changed, 56 deletions(-)
 delete mode 100644 test/ParsingTests.hs

diff --git a/haskell-lsp-test.cabal b/haskell-lsp-test.cabal
index bc0f581..4a3c5ed 100644
--- a/haskell-lsp-test.cabal
+++ b/haskell-lsp-test.cabal
@@ -71,7 +71,6 @@ test-suite tests
                      , aeson
                      , unordered-containers
                      , text
-  other-modules:       ParsingTests
   default-language:    Haskell2010
 
 executable example
diff --git a/src/Language/Haskell/LSP/Test.hs b/src/Language/Haskell/LSP/Test.hs
index 64100a4..eda3cd2 100644
--- a/src/Language/Haskell/LSP/Test.hs
+++ b/src/Language/Haskell/LSP/Test.hs
@@ -19,7 +19,6 @@ module Language.Haskell.LSP.Test
   , runSessionWithConfig
   , Session
   , SessionConfig(..)
-  , MonadSessionConfig(..)
   , SessionException(..)
   , anySessionException
   , withTimeout
diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 2418cd5..10f63b2 100644
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -9,7 +9,6 @@ module Language.Haskell.LSP.Test.Session
   , SessionMessage(..)
   , SessionContext(..)
   , SessionState(..)
-  , MonadSessionConfig(..)
   , runSessionWithHandles
   , get
   , put
@@ -79,12 +78,6 @@ data SessionConfig = SessionConfig
 instance Default SessionConfig where
   def = SessionConfig def 60 False
 
-class Monad m => MonadSessionConfig m where
-  sessionConfig :: m SessionConfig
-
-instance Monad m => MonadSessionConfig (StateT SessionState (ReaderT SessionContext m)) where
-  sessionConfig = config <$> lift Reader.ask
-
 data SessionMessage = ServerMessage FromServerMessage
                     | TimeoutMessage Int
   deriving Show
diff --git a/test/ParsingTests.hs b/test/ParsingTests.hs
deleted file mode 100644
index e0ed6f6..0000000
--- a/test/ParsingTests.hs
+++ /dev/null
@@ -1,44 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE FlexibleInstances #-}
-module ParsingTests where
-
-import Control.Lens hiding (List)
-import Language.Haskell.LSP.Messages
-import Language.Haskell.LSP.Test
-import Language.Haskell.LSP.Types
-import Data.Conduit
-import Data.Conduit.Parser
-import Data.Default
-import Test.Hspec
-
-type TestSession = ConduitParser FromServerMessage IO
-
-instance MonadSessionConfig IO where
-  sessionConfig = return def
-
-parsingSpec :: Spec
-parsingSpec = return ()
---   describe "diagnostics" $ do
---     let testDiag = NotPublishDiagnostics
---                    (NotificationMessage "2.0"
---                                        TextDocumentPublishDiagnostics
---                                        (PublishDiagnosticsParams (Uri "foo")
---                                                                  (List [])))
---     it "get picked up" $ do
---       let source = yield testDiag
---           session = do
---             diags <- publishDiagnosticsNotification :: TestSession PublishDiagnosticsNotification
---             return $ diags ^. params . uri
---       runConduit (source .| runConduitParser session) `shouldReturn` Uri "foo"
---     it "get picked up after skipping others before" $ do
---       let testDiag = NotPublishDiagnostics
---                     (NotificationMessage "2.0"
---                                           TextDocumentPublishDiagnostics
---                                           (PublishDiagnosticsParams (Uri "foo")
---                                                                     (List [])))
---           notTestDiag = NotLogMessage (NotificationMessage "2.0" WindowLogMessage (LogMessageParams MtLog "foo"))
---           source = yield notTestDiag >> yield testDiag
---           session = do
---             diags <- skipManyTill anyNotification notification :: TestSession PublishDiagnosticsNotification
---             return $ diags ^. params . uri
---       runConduit (source .| runConduitParser session) `shouldReturn` Uri "foo"
diff --git a/test/Test.hs b/test/Test.hs
index f229ea2..90be1e2 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -18,7 +18,6 @@ import           Language.Haskell.LSP.Test
 import           Language.Haskell.LSP.Test.Replay
 import           Language.Haskell.LSP.TH.ClientCapabilities
 import           Language.Haskell.LSP.Types hiding (message, capabilities)
-import           ParsingTests
 import           System.Timeout
 
 main = hspec $ do
@@ -203,8 +202,6 @@ main = hspec $ do
         mainSymbol ^. location . range `shouldBe` Range (Position 3 0) (Position 3 4)
         mainSymbol ^. containerName `shouldBe` Nothing
 
-  parsingSpec
-
 data ApplyOneParams = AOP
   { file      :: Uri
   , start_pos :: Position
-- 
2.30.2