Add nicer API

[opengl.git] / test / Test.hs

diff --git a/test/Test.hs b/test/Test.hs
index 3c53aec67dd292859abc0285e939da6d3d3d532f..b3a54ed9cd0d7f890ad4abbc968d6e993587a037 100644 (file)
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -2,11 +2,12 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+
 import           Test.Hspec
 import           Data.Aeson
 import           Data.Default
 import qualified Data.HashMap.Strict as HM
-import           Data.Maybe
+import qualified Data.Text as T
 import           Control.Concurrent
 import           Control.Monad.IO.Class
 import           Control.Lens hiding (List)
@@ -20,24 +21,6 @@ import           ParsingTests
 
 main = hspec $ do
   describe "manual session" $ do
-    it "passes a test" $
-      runSession "hie --lsp" "test/data/renamePass" $ do
-        doc <- openDoc "Desktop/simple.hs" "haskell"
-
-        skipMany loggingNotification
-
-        checkNoDiagnostics
-
-        rspSymbols <- documentSymbols doc
-
-        liftIO $ do
-          let (List symbols) = fromJust (rspSymbols ^. result)
-              mainSymbol = head symbols
-          mainSymbol ^. name `shouldBe` "main"
-          mainSymbol ^. kind `shouldBe` SkFunction
-          mainSymbol ^. location . range `shouldBe` Range (Position 3 0) (Position 3 4)
-          mainSymbol ^. containerName `shouldBe` Nothing
-
     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
@@ -46,7 +29,7 @@ main = hspec $ do
                       anyRequest
         in session `shouldThrow` anyException
     it "can get initialize response" $ runSession "hie --lsp" "test/data/renamePass" $ do
-      rsp <- getInitializeResponse
+      rsp <- initializeResponse
       liftIO $ rsp ^. result `shouldNotBe` Nothing
 
     it "can register specific capabilities" $ do
@@ -80,7 +63,7 @@ main = hspec $ do
             selector _ = False
             sesh = do
               doc <- openDoc "Desktop/simple.hs" "haskell"
-              sendRequest TextDocumentDocumentSymbol (DocumentSymbolParams doc)
+              sendRequest' TextDocumentDocumentSymbol (DocumentSymbolParams doc)
               skipMany anyNotification
               response :: Session RenameResponse -- the wrong type
           in runSession "hie --lsp" "test/data/renamePass" sesh
@@ -99,17 +82,15 @@ main = hspec $ do
       runSession "javascript-typescript-stdio" "test/data/javascriptPass" $ do
         doc <- openDoc "test.js" "javascript"
 
-        checkNoDiagnostics
+        noDiagnostics
 
-        rspSymbols <- documentSymbols doc
+        (fooSymbol:_) <- getDocumentSymbols doc
 
-        let (List symbols) = fromJust (rspSymbols ^. result)
-            fooSymbol = head symbols
         liftIO $ do
           fooSymbol ^. name `shouldBe` "foo"
           fooSymbol ^. kind `shouldBe` SkFunction
 
-  describe "text document state" $
+  describe "text document VFS" $
     it "sends back didChange notifications" $
       runSession "hie --lsp" "test/data/refactor" $ do
         doc <- openDoc "Main.hs" "haskell"
@@ -118,9 +99,7 @@ main = hspec $ do
                                 (Position 1 14)
                                 "Redundant bracket"
             reqParams = ExecuteCommandParams "applyrefact:applyOne" (Just (List [args]))
-        sendRequest WorkspaceExecuteCommand reqParams
-        skipMany anyNotification
-        _ <- response :: Session ExecuteCommandResponse
+        sendRequest_ WorkspaceExecuteCommand reqParams
 
         editReq <- request :: Session ApplyWorkspaceEditRequest
         liftIO $ do
@@ -129,11 +108,51 @@ main = hspec $ do
           u `shouldBe` doc ^. uri
           es `shouldBe` [TextEdit (Range (Position 1 0) (Position 1 18)) "main = return 42"]
 
-        checkNoDiagnostics
+        noDiagnostics
 
         contents <- documentContents doc
         liftIO $ contents `shouldBe` "main :: IO Int\nmain = return 42"
     
+  describe "documentEdit" $
+    it "automatically consumes applyedit requests" $
+      runSession "hie --lsp" "test/data/refactor" $ do
+        doc <- openDoc "Main.hs" "haskell"
+
+        let args = toJSON $ AOP (doc ^. uri)
+                                (Position 1 14)
+                                "Redundant bracket"
+            reqParams = ExecuteCommandParams "applyrefact:applyOne" (Just (List [args]))
+        sendRequest_ WorkspaceExecuteCommand reqParams
+        contents <- getDocumentEdit doc
+        liftIO $ contents `shouldBe` "main :: IO Int\nmain = return 42"
+        noDiagnostics
+  
+  describe "getAllCodeActions" $
+    it "works" $ runSession "hie --lsp" "test/data/refactor" $ do
+      doc <- openDoc "Main.hs" "haskell"
+      _ <- waitForDiagnostics
+      actions <- getAllCodeActions doc
+      liftIO $ do
+        let [CommandOrCodeActionCommand action] = actions
+        action ^. title `shouldBe` "Apply hint:Redundant bracket"
+        action ^. command `shouldSatisfy` T.isSuffixOf ":applyrefact:applyOne"
+  
+  describe "getDocumentSymbols" $ 
+    it "works" $ runSession "hie --lsp" "test/data/renamePass" $ do
+      doc <- openDoc "Desktop/simple.hs" "haskell"
+
+      skipMany loggingNotification
+
+      noDiagnostics
+
+      (mainSymbol:_) <- getDocumentSymbols doc
+
+      liftIO $ do
+        mainSymbol ^. name `shouldBe` "main"
+        mainSymbol ^. kind `shouldBe` SkFunction
+        mainSymbol ^. location . range `shouldBe` Range (Position 3 0) (Position 3 4)
+        mainSymbol ^. containerName `shouldBe` Nothing
+
   parsingSpec
 
 data ApplyOneParams = AOP
@@ -142,12 +161,3 @@ data ApplyOneParams = AOP
   , hintTitle :: String
   } deriving (Generic, ToJSON)
 
-checkNoDiagnostics :: Session ()
-checkNoDiagnostics = do
-  diagsNot <- notification :: Session PublishDiagnosticsNotification
-  liftIO $ diagsNot ^. params . diagnostics `shouldBe` List []
-
-documentSymbols :: TextDocumentIdentifier -> Session DocumentSymbolsResponse
-documentSymbols doc = do
-  sendRequest TextDocumentDocumentSymbol (DocumentSymbolParams doc)
-  response