Merge pull request bubba/lsp-test/#68 from wz1000/singleton-methods

WIP: Initial attempt at updating for singleton-methods

Author: lukel97

lsp-test/.github/workflows/haskell.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/[email protected].1
+    - uses: actions/[email protected].4
       with:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: '3.2'

lsp-test/README.md

@@ -2,7 +2,7 @@
 lsp-test is a functional testing framework for Language Server Protocol servers.
 
 ```haskell
-import Language.Haskell.LSP.Test
+import Language.LSP.Test
 main = runSession "hie" fullCaps "proj/dir" $ do
   doc <- openDoc "Foo.hs" "haskell"
   skipMany anyNotification

lsp-test/cabal.project

@@ -1,4 +1,5 @@
 packages: .
+          ./example
 flags: +DummyServer
 test-show-details: direct
 haddock-quickjump: True

lsp-test/example/Test.hs

@@ -1,19 +1,19 @@
 import Control.Applicative.Combinators
 import Control.Monad.IO.Class
-import Language.Haskell.LSP.Test
-import Language.Haskell.LSP.Types
+import Language.LSP.Test
+import Language.LSP.Types
 
-main = runSession "hie" fullCaps "../test/data/" $ do
-  docItem <- openDoc "Rename.hs" "haskell"
+main = runSession "haskell-language-server" fullCaps "../test/data/" $ do
+  doc <- openDoc "Rename.hs" "haskell"
 
   -- Use your favourite favourite combinators.
   skipManyTill loggingNotification (count 2 publishDiagnosticsNotification)
 
   -- Send requests and notifications and receive responses
-  let params = DocumentSymbolParams docItem
-  rsp <- request TextDocumentDocumentSymbol params :: Session DocumentSymbolsResponse
+  rsp <- request STextDocumentDocumentSymbol $
+          DocumentSymbolParams Nothing Nothing doc
   liftIO $ print rsp
 
   -- Or use one of the helper functions
-  getDocumentSymbols docItem >>= liftIO . print
+  getDocumentSymbols doc >>= liftIO . print
 

lsp-test/hie.yaml

@@ -0,0 +1,16 @@
+cradle:
+  multi:
+    - path: "./test/data/"
+      config: { cradle: { none:  } }
+    - path: "./example/"
+      config: { cradle: { none:  } }
+    - path: "./"
+      config:
+        cradle:
+          cabal:
+            - path: "src"
+              component: "lib:lsp-test"
+            - path: "test/dummy-server"
+              component: "exe:dummy-server"
+            - path: "test"
+              component: "test:tests"

lsp-test/lsp-test.cabal

@@ -4,8 +4,8 @@ synopsis:            Functional test framework for LSP servers.
 description:
   A test framework for writing tests against
   <https://microsoft.github.io/language-server-protocol/ Language Server Protocol servers>.
-  @Language.Haskell.LSP.Test@ launches your server as a subprocess and allows you to simulate a session
-  down to the wire, and @Language.Haskell.LSP.Test@ can replay captured sessions from
+  @Language.LSP.Test@ launches your server as a subprocess and allows you to simulate a session
+  down to the wire, and @Language.LSP.Test@ can replay captured sessions from
   <haskell-lsp https://hackage.haskell.org/package/haskell-lsp>.
   To see examples of it in action, check out <https://github.com/haskell/haskell-ide-engine haskell-ide-engine>,
   <https://github.com/haskell/haskell-language-server haskell-language-server> and
@@ -22,7 +22,7 @@ build-type:          Simple
 cabal-version:       2.0
 extra-source-files:  README.md
                    , ChangeLog.md
-tested-with:         GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.1
+tested-with:         GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.1, GHC == 8.10.2
 
 source-repository head
   type:     git
@@ -35,15 +35,15 @@ Flag DummyServer
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Language.Haskell.LSP.Test
-                     , Language.Haskell.LSP.Test.Replay
-  reexported-modules:  haskell-lsp:Language.Haskell.LSP.Types
-                     , haskell-lsp:Language.Haskell.LSP.Types.Capabilities
+  exposed-modules:     Language.LSP.Test
+  reexported-modules:  lsp-types:Language.LSP.Types
+                     , lsp-types:Language.LSP.Types.Capabilities
                      , parser-combinators:Control.Applicative.Combinators
   default-language:    Haskell2010
   build-depends:       base >= 4.10 && < 5
-                     , haskell-lsp >= 0.22 && < 0.24
+                     , lsp-types >= 1.0.0.1 && < 1.1
                      , aeson
+                     , time
                      , aeson-pretty
                      , ansi-terminal
                      , async
@@ -63,31 +63,32 @@ library
                      , text
                      , transformers
                      , unordered-containers
+                     , some
   if os(windows)
     build-depends:     Win32
   else
     build-depends:     unix
-  other-modules:       Language.Haskell.LSP.Test.Compat
-                       Language.Haskell.LSP.Test.Decoding
-                       Language.Haskell.LSP.Test.Exceptions
-                       Language.Haskell.LSP.Test.Files
-                       Language.Haskell.LSP.Test.Messages
-                       Language.Haskell.LSP.Test.Parsing
-                       Language.Haskell.LSP.Test.Server
-                       Language.Haskell.LSP.Test.Session
+  other-modules:       Language.LSP.Test.Compat
+                       Language.LSP.Test.Decoding
+                       Language.LSP.Test.Exceptions
+                       Language.LSP.Test.Files
+                       Language.LSP.Test.Parsing
+                       Language.LSP.Test.Server
+                       Language.LSP.Test.Session
   ghc-options:         -W
 
 executable dummy-server
   main-is:             Main.hs
   hs-source-dirs:      test/dummy-server
   ghc-options:         -W
-  build-depends:       base >= 4.10 && < 5
-                     , haskell-lsp >= 0.23 && < 0.24
-                     , data-default
+  build-depends:       base >= 4.11 && < 5
+                     , lsp >= 1.0.0.1 && < 1.1
                      , aeson
                      , unordered-containers
                      , directory
                      , filepath
+                     , unliftio
+                     , mtl
   default-language:    Haskell2010
   scope:               private
   if !flag(DummyServer)
@@ -101,7 +102,7 @@ test-suite tests
   build-depends:       base >= 4.10 && < 5
                      , hspec
                      , lens
-                     , haskell-lsp >= 0.22 && < 0.24
+                     , lsp-types >= 1.0.0.1 && < 1.1
                      , lsp-test
                      , data-default
                      , aeson
@@ -110,4 +111,4 @@ test-suite tests
                      , directory
                      , filepath
   default-language:    Haskell2010
-  build-tool-depends: lsp-test:dummy-server
+  build-tool-depends:  lsp-test:dummy-server