Merge pull request #69 from fendor/fix-warnings-brittany-pr-cleanup

Fix Brittany test suite

Author: alanz

test/functional/FormatSpec.hs

@@ -92,33 +92,34 @@ spec = do
       sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany"))
       let opts = DocumentFormattingParams doc (FormattingOptions 4 True) Nothing
       ResponseMessage _ _ (Just edits) _ <- request TextDocumentFormatting opts
-      liftIO $ edits `shouldBe` [TextEdit (Range (Position 0 0) (Position 3 0))
-                                  "foo :: Int -> String -> IO ()\nfoo x y = do\n    print x\n    return 42\n"]
+      liftIO $ edits `shouldBe` [TextEdit (Range (Position 0 0) (Position 5 0))
+                                  "module BrittanyLF where\n\nfoo :: Int -> String -> IO ()\nfoo x y = do\n    print x\n    return ()\n"]
 
     it "formats a document with CRLF endings" $ runSession hieCommand fullCaps "test/testdata" $ do
       doc <- openDoc "BrittanyCRLF.hs" "haskell"
       sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany"))
       let opts = DocumentFormattingParams doc (FormattingOptions 4 True) Nothing
       ResponseMessage _ _ (Just edits) _ <- request TextDocumentFormatting opts
-      liftIO $ edits `shouldBe` [TextEdit (Range (Position 0 0) (Position 3 0))
-                                  "foo :: Int -> String -> IO ()\nfoo x y = do\n    print x\n    return 42\n"]
+      liftIO $ edits `shouldBe` [TextEdit (Range (Position 0 0) (Position 5 0))
+                                  "module BrittanyCRLF where\n\nfoo :: Int -> String -> IO ()\nfoo x y = do\n    print x\n    return ()\n"]
 
     it "formats a range with LF endings" $ runSession hieCommand fullCaps "test/testdata" $ do
       doc <- openDoc "BrittanyLF.hs" "haskell"
       sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany"))
-      let range = Range (Position 1 0) (Position 2 22)
+      let range = Range (Position 3 0) (Position 5 22)
           opts = DocumentRangeFormattingParams doc range (FormattingOptions 4 True) Nothing
       ResponseMessage _ _ (Just edits) _ <- request TextDocumentRangeFormatting opts
-      liftIO $ edits `shouldBe` [TextEdit (Range (Position 1 0) (Position 3 0))
-                                    "foo x y = do\n    print x\n    return 42\n"]
+      liftIO $ edits `shouldBe` [TextEdit (Range (Position 3 0) (Position 6 0))
+                                    "foo x y = do\n    print x\n    return ()\n"]
 
     it "formats a range with CRLF endings" $ runSession hieCommand fullCaps "test/testdata" $ do
       doc <- openDoc "BrittanyCRLF.hs" "haskell"
-      let range = Range (Position 1 0) (Position 2 22)
+      sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany"))
+      let range = Range (Position 3 0) (Position 5 22)
           opts = DocumentRangeFormattingParams doc range (FormattingOptions 4 True) Nothing
       ResponseMessage _ _ (Just edits) _ <- request TextDocumentRangeFormatting opts
-      liftIO $ edits `shouldBe` [TextEdit (Range (Position 1 0) (Position 3 0))
-                                    "foo x y = do\n    print x\n    return 42\n"]
+      liftIO $ edits `shouldBe` [TextEdit (Range (Position 3 0) (Position 6 0))
+                                    "foo x y = do\n    print x\n    return ()\n"]
 
     -- ---------------------------------
 

test/utils/TestUtils.hs

@@ -24,12 +24,9 @@ where
 
 -- import           Control.Concurrent.STM
 import           Control.Monad
-import           Data.Aeson.Types (typeMismatch)
 import           Data.Default
 import           Data.List (intercalate)
-import           Data.Text (pack)
 -- import           Data.Typeable
-import           Data.Yaml
 -- import qualified Data.Map as Map
 import           Data.Maybe
 import           Language.Haskell.LSP.Core