Merge pull request #404 from michaelpj/mpj/move-vfs

Move VFS to lsp

Author: michaelpj

lsp-test/ChangeLog.md

@@ -1,8 +1,12 @@
 # Revision history for lsp-test
 
+## 0.14.0.3
+
+* Compatibility with new `lsp-types` major version.
+
 ## 0.14.0.2 
 
-* Compatibility with new lsp-types major version.
+* Compatibility with new `lsp-types` major version.
 
 ## 0.14.0.1 -- 2021-07-30
 

lsp-test/lsp-test.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.4
 name:                lsp-test
-version:             0.14.0.2
+version:             0.14.0.3
 synopsis:            Functional test framework for LSP servers.
 description:
   A test framework for writing tests against
@@ -36,7 +36,8 @@ library
                      , parser-combinators:Control.Applicative.Combinators
   default-language:    Haskell2010
   build-depends:       base >= 4.10 && < 5
-                     , lsp-types == 1.4.*
+                     , lsp-types == 1.5.*
+                     , lsp == 1.5.*
                      , aeson
                      , time
                      , aeson-pretty
@@ -81,7 +82,7 @@ test-suite tests
   build-depends:       base >= 4.10 && < 5
                      , hspec
                      , lens
-                     , lsp == 1.4.*
+                     , lsp == 1.5.*
                      , lsp-test
                      , data-default
                      , aeson

lsp-types/ChangeLog.md

@@ -1,5 +1,9 @@
 # Revision history for lsp-types
 
+## 1.5.0.0
+
+* VFS module moved from `lsp-types` to `lsp`, as it relates to the actual implementation of a LSP server.
+
 ## 1.4.0.1
 
 * Fix result type of selection range requests.

lsp-types/lsp-types.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                lsp-types
-version:             1.4.0.1
+version:             1.5.0.0
 synopsis:            Haskell library for the Microsoft Language Server Protocol, data types
 
 description:         An implementation of the types to allow language implementors to
@@ -21,7 +21,6 @@ library
                      , Language.LSP.Types.Capabilities
                      , Language.LSP.Types.Lens
                      , Language.LSP.Types.SMethodMap
-                     , Language.LSP.VFS
                      , Data.IxMap
   other-modules:       Language.LSP.Types.CallHierarchy
                      , Language.LSP.Types.Cancellation
@@ -74,26 +73,21 @@ library
   build-depends:       base >= 4.11 && < 5
                      , aeson >=1.2.2.0
                      , binary
-                     , bytestring
                      , containers
                      , data-default
                      , deepseq
                      , Diff
-                     , directory
                      , dlist
                      , filepath
                      , hashable
-                     , hslogger
                      , lens >= 4.15.2
                      , mtl
                      , network-uri
                      , mod
                      , scientific
                      , some
                      , text
-                     , text-rope
                      , template-haskell
-                     , temporary
                      , unordered-containers
   hs-source-dirs:      src
   default-language:    Haskell2010

lsp/ChangeLog.md

@@ -1,5 +1,9 @@
 # Revision history for lsp
 
+## 1.5.0.0
+
+* VFS module moved to `lsp` from `lsp-types`.
+
 ## 1.4.0.0
 
 * Fix extraneous `asdf` in `withProgress` output (#372) (@heitor-lassarote)

lsp/lsp.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                lsp
-version:             1.4.0.0
+version:             1.5.0.0
 synopsis:            Haskell library for the Microsoft Language Server Protocol
 
 description:         An implementation of the types, and basic message server to
@@ -24,9 +24,9 @@ library
   reexported-modules:  Language.LSP.Types
                      , Language.LSP.Types.Capabilities
                      , Language.LSP.Types.Lens
-                     , Language.LSP.VFS
   exposed-modules:     Language.LSP.Server
                      , Language.LSP.Diagnostics
+                     , Language.LSP.VFS
   other-modules:       Language.LSP.Server.Core
                      , Language.LSP.Server.Control
                      , Language.LSP.Server.Processing
@@ -38,17 +38,21 @@ library
                      , bytestring
                      , containers
                      , data-default
+                     , directory
                      , exceptions
+                     , filepath
                      , hslogger
                      , hashable
-                     , lsp-types == 1.4.*
+                     , lsp-types == 1.5.*
                      , lens >= 4.15.2
                      , mtl
                      , network-uri
                      , sorted-list == 0.2.1.*
                      , stm == 2.5.*
                      , scientific
+                     , temporary
                      , text
+                     , text-rope
                      , transformers >= 0.5.6 && < 0.6
                      , time
                      , unordered-containers