Tidy up and remove redundant classes and tests

diff --git a/haskell-lsp-test.cabal b/haskell-lsp-test.cabal
index bc0f58193b9f234f507cfbf04c264776515ccb61..4a3c5ed9c1d957b9546382f254c6b86c0a738815 100644 (file)
--- 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 64100a4ced2d3f606857374e57a2735fc7770158..eda3cd2f2925bd34fdef4014482d4c8eef2a6133 100644 (file)
--- 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/Parsing.hs b/src/Language/Haskell/LSP/Test/Parsing.hs
index 2418cd5ac6e09cab04be5b23c813a0fe0d987a1a..10f63b245fb0e5bf93f7b6a9f0d54ec0b27837c1 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Parsing.hs
+++ b/src/Language/Haskell/LSP/Test/Parsing.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/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
deleted file mode 100644 (file)
index e0ed6f66ee4600b89057a2eee6e59290f84942ea..0000000000000000000000000000000000000000
--- a/src/Language/Haskell/LSP/Test/Session.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/ParsingTests.hs b/test/ParsingTests.hs
index f229ea216145f9a3a2743447c55f8444554ca534..90be1e2eee7243f821661b3350637d224caebec8 100644 (file)
--- a/test/ParsingTests.hs
+++ b/test/ParsingTests.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

diff --cc test/Test.hs
Simple merge