X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=test%2FTest.hs;h=08c21be300e45fc9b87e766750399fc8b62d5329;hp=a4a41732e395e36c9581525f398f985f32527af0;hb=e0926c045ccd5444f3112cb231cc3590c600d48d;hpb=776b8e1a475e2150797d432f0c13ccf685b1cd4b diff --git a/test/Test.hs b/test/Test.hs index a4a4173..08c21be 100644 --- a/test/Test.hs +++ b/test/Test.hs @@ -29,22 +29,21 @@ main = hspec $ do describe "Session" $ do it "fails a test" $ -- TODO: Catch the exception in haskell-lsp-test and provide nicer output - let session = runSession "hie --lsp" "test/data/renamePass" $ do + let session = runSession "hie --lsp" fullCaps "test/data/renamePass" $ do openDoc "Desktop/simple.hs" "haskell" skipMany loggingNotification anyRequest in session `shouldThrow` anyException - it "initializeResponse" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "initializeResponse" $ runSession "hie --lsp" fullCaps "test/data/renamePass" $ do rsp <- initializeResponse liftIO $ rsp ^. result `shouldNotBe` Nothing it "runSessionWithConfig" $ - runSessionWithConfig (def { capabilities = didChangeCaps }) - "hie --lsp" "test/data/renamePass" $ return () + runSession "hie --lsp" didChangeCaps "test/data/renamePass" $ return () describe "withTimeout" $ do it "times out" $ - let sesh = runSession "hie --lsp" "test/data/renamePass" $ do + let sesh = runSession "hie --lsp" fullCaps "test/data/renamePass" $ do openDoc "Desktop/simple.hs" "haskell" -- won't receive a request - will timeout -- incoming logging requests shouldn't increase the @@ -55,12 +54,12 @@ main = hspec $ do in timeout 6000000 sesh `shouldThrow` anySessionException it "doesn't time out" $ - let sesh = runSession "hie --lsp" "test/data/renamePass" $ do + let sesh = runSession "hie --lsp" fullCaps "test/data/renamePass" $ do openDoc "Desktop/simple.hs" "haskell" withTimeout 5 $ skipManyTill anyMessage publishDiagnosticsNotification in void $ timeout 6000000 sesh - it "further timeout messages are ignored" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "further timeout messages are ignored" $ runSession "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" withTimeout 3 $ getDocumentSymbols doc liftIO $ threadDelay 5000000 @@ -70,7 +69,7 @@ main = hspec $ do it "overrides global message timeout" $ let sesh = - runSessionWithConfig (def { messageTimeout = 5 }) "hie --lsp" "test/data/renamePass" $ do + runSessionWithConfig (def { messageTimeout = 5 }) "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" -- shouldn't time out in here since we are overriding it withTimeout 10 $ liftIO $ threadDelay 7000000 @@ -80,7 +79,7 @@ main = hspec $ do it "unoverrides global message timeout" $ let sesh = - runSessionWithConfig (def { messageTimeout = 5 }) "hie --lsp" "test/data/renamePass" $ do + runSessionWithConfig (def { messageTimeout = 5 }) "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" -- shouldn't time out in here since we are overriding it withTimeout 10 $ liftIO $ threadDelay 7000000 @@ -92,13 +91,13 @@ main = hspec $ do describe "SessionException" $ do it "throw on time out" $ - let sesh = runSessionWithConfig (def {messageTimeout = 10}) "hie --lsp" "test/data/renamePass" $ do + let sesh = runSessionWithConfig (def {messageTimeout = 10}) "hie --lsp" fullCaps "test/data/renamePass" $ do skipMany loggingNotification _ <- message :: Session ApplyWorkspaceEditRequest return () in sesh `shouldThrow` anySessionException - it "don't throw when no time out" $ runSessionWithConfig (def {messageTimeout = 5}) "hie --lsp" "test/data/renamePass" $ do + it "don't throw when no time out" $ runSessionWithConfig (def {messageTimeout = 5}) "hie --lsp" fullCaps "test/data/renamePass" $ do loggingNotification liftIO $ threadDelay 10 _ <- openDoc "Desktop/simple.hs" "haskell" @@ -108,7 +107,7 @@ main = hspec $ do it "throws when there's an unexpected message" $ let selector (UnexpectedMessage "Publish diagnostics notification" (NotLogMessage _)) = True selector _ = False - in runSession "hie --lsp" "test/data/renamePass" publishDiagnosticsNotification `shouldThrow` selector + in runSession "hie --lsp" fullCaps "test/data/renamePass" publishDiagnosticsNotification `shouldThrow` selector it "provides the correct types that were expected and received" $ let selector (UnexpectedMessage "ResponseMessage WorkspaceEdit" (RspDocumentSymbols _)) = True selector _ = False @@ -117,7 +116,7 @@ main = hspec $ do sendRequest' TextDocumentDocumentSymbol (DocumentSymbolParams doc) skipMany anyNotification message :: Session RenameResponse -- the wrong type - in runSession "hie --lsp" "test/data/renamePass" sesh + in runSession "hie --lsp" fullCaps "test/data/renamePass" sesh `shouldThrow` selector describe "replaySession" $ do @@ -130,7 +129,7 @@ main = hspec $ do describe "manual javascript session" $ it "passes a test" $ - runSession "javascript-typescript-stdio" "test/data/javascriptPass" $ do + runSession "javascript-typescript-stdio" fullCaps "test/data/javascriptPass" $ do doc <- openDoc "test.js" "javascript" noDiagnostics @@ -143,7 +142,7 @@ main = hspec $ do describe "text document VFS" $ it "sends back didChange notifications" $ - runSession "hie --lsp" "test/data/refactor" $ do + runSession "hie --lsp" def "test/data/refactor" $ do doc <- openDoc "Main.hs" "haskell" let args = toJSON $ AOP (doc ^. uri) @@ -166,7 +165,7 @@ main = hspec $ do describe "getDocumentEdit" $ it "automatically consumes applyedit requests" $ - runSession "hie --lsp" "test/data/refactor" $ do + runSession "hie --lsp" fullCaps "test/data/refactor" $ do doc <- openDoc "Main.hs" "haskell" let args = toJSON $ AOP (doc ^. uri) @@ -179,17 +178,17 @@ main = hspec $ do noDiagnostics describe "getAllCodeActions" $ - it "works" $ runSession "hie --lsp" "test/data/refactor" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data/refactor" $ do doc <- openDoc "Main.hs" "haskell" _ <- waitForDiagnostics actions <- getAllCodeActions doc liftIO $ do - let [CommandOrCodeActionCommand action] = actions + let [CommandOrCodeActionCodeAction action] = actions action ^. title `shouldBe` "Apply hint:Redundant bracket" - action ^. command `shouldSatisfy` T.isSuffixOf ":applyrefact:applyOne" + action ^. command . _Just . command `shouldSatisfy` T.isSuffixOf ":applyrefact:applyOne" describe "getDocumentSymbols" $ - it "works" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" skipMany loggingNotification @@ -205,13 +204,13 @@ main = hspec $ do mainSymbol ^. containerName `shouldBe` Nothing describe "applyEdit" $ do - it "increments the version" $ runSessionWithConfig (def { capabilities = docChangesCaps }) "hie --lsp" "test/data/renamePass" $ do + it "increments the version" $ runSession "hie --lsp" docChangesCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" VersionedTextDocumentIdentifier _ (Just oldVersion) <- getVersionedDoc doc let edit = TextEdit (Range (Position 1 1) (Position 1 3)) "foo" VersionedTextDocumentIdentifier _ (Just newVersion) <- applyEdit doc edit liftIO $ newVersion `shouldBe` oldVersion + 1 - it "changes the document contents" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "changes the document contents" $ runSession "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" let edit = TextEdit (Range (Position 0 0) (Position 0 2)) "foo" applyEdit doc edit @@ -219,16 +218,16 @@ main = hspec $ do liftIO $ contents `shouldSatisfy` T.isPrefixOf "foodule" describe "getCompletions" $ - it "works" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "works" $ runSession "hie --lsp" def "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" - [item] <- getCompletions doc (Position 5 5) + item:_ <- getCompletions doc (Position 5 5) liftIO $ do item ^. label `shouldBe` "interactWithUser" item ^. kind `shouldBe` Just CiFunction item ^. detail `shouldBe` Just "Items -> IO ()\nMain" describe "getReferences" $ - it "works" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" let pos = Position 40 3 -- interactWithUser uri = doc ^. LSP.uri @@ -240,14 +239,14 @@ main = hspec $ do ] describe "getDefinitions" $ - it "works" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" let pos = Position 49 25 -- addItem defs <- getDefinitions doc pos liftIO $ defs `shouldBe` [Location (doc ^. uri) (mkRange 28 0 28 7)] describe "waitForDiagnosticsSource" $ - it "works" $ runSession "hie --lsp" "test/data" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data" $ do openDoc "Error.hs" "haskell" [diag] <- waitForDiagnosticsSource "ghcmod" liftIO $ do @@ -255,13 +254,13 @@ main = hspec $ do diag ^. source `shouldBe` Just "ghcmod" describe "rename" $ - it "works" $ runSession "hie --lsp" "test/data" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data" $ do doc <- openDoc "Rename.hs" "haskell" rename doc (Position 1 0) "bar" documentContents doc >>= liftIO . shouldBe "main = bar\nbar = return 42\n" describe "getHover" $ - it "works" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" -- hover returns nothing until module is loaded skipManyTill loggingNotification $ count 2 noDiagnostics @@ -269,21 +268,21 @@ main = hspec $ do liftIO $ hover `shouldSatisfy` isJust describe "getHighlights" $ - it "works" $ runSession "hie --lsp" "test/data/renamePass" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data/renamePass" $ do doc <- openDoc "Desktop/simple.hs" "haskell" skipManyTill loggingNotification $ count 2 noDiagnostics highlights <- getHighlights doc (Position 27 4) -- addItem liftIO $ length highlights `shouldBe` 4 describe "formatDoc" $ - it "works" $ runSession "hie --lsp" "test/data" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data" $ do doc <- openDoc "Format.hs" "haskell" oldContents <- documentContents doc formatDoc doc (FormattingOptions 4 True) documentContents doc >>= liftIO . (`shouldNotBe` oldContents) describe "formatRange" $ - it "works" $ runSession "hie --lsp" "test/data" $ do + it "works" $ runSession "hie --lsp" fullCaps "test/data" $ do doc <- openDoc "Format.hs" "haskell" oldContents <- documentContents doc formatRange doc (FormattingOptions 4 True) (Range (Position 1 10) (Position 2 10)) @@ -292,7 +291,7 @@ main = hspec $ do describe "closeDoc" $ it "works" $ let sesh = - runSession "hie --lsp" "test/data" $ do + runSession "hie --lsp" fullCaps "test/data" $ do doc <- openDoc "Format.hs" "haskell" closeDoc doc -- need to evaluate to throw