Remove Language.LSP.Types.Synonyms

Not used much and was out of date

lsp-types/lsp-types.cabal

@@ -56,7 +56,6 @@ library
                      , Language.LSP.Types.ServerCapabilities
                      , Language.LSP.Types.SignatureHelp
                      , Language.LSP.Types.StaticRegistrationOptions
-                     , Language.LSP.Types.Synonyms
                      , Language.LSP.Types.TextDocument
                      , Language.LSP.Types.TypeDefinition
                      , Language.LSP.Types.Uri

lsp-types/src/Language/LSP/Types.hs

@@ -31,7 +31,6 @@ module Language.LSP.Types
   , module Language.LSP.Types.SignatureHelp
   , module Language.LSP.Types.StaticRegistrationOptions
   , module Language.LSP.Types.SelectionRange
-  , module Language.LSP.Types.Synonyms
   , module Language.LSP.Types.TextDocument
   , module Language.LSP.Types.TypeDefinition
   , module Language.LSP.Types.Uri
@@ -75,7 +74,6 @@ import           Language.LSP.Types.Rename
 import           Language.LSP.Types.SelectionRange
 import           Language.LSP.Types.SignatureHelp
 import           Language.LSP.Types.StaticRegistrationOptions
-import           Language.LSP.Types.Synonyms
 import           Language.LSP.Types.TextDocument
 import           Language.LSP.Types.TypeDefinition
 import           Language.LSP.Types.Uri

lsp-types/src/Language/LSP/VFS.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE DataKinds #-}
 
 {-|
 Handles the "Language.LSP.Types.TextDocumentDidChange" \/
@@ -95,8 +96,8 @@ initVFS k = withSystemTempDirectory "haskell-lsp" $ \temp_dir -> k (VFS mempty t
 
 -- ---------------------------------------------------------------------
 
--- ^ Applies the changes from a 'DidOpenTextDocumentNotification' to the 'VFS'
-openVFS :: VFS -> J.DidOpenTextDocumentNotification -> (VFS, [String])
+-- | Applies the changes from a 'J.DidOpenTextDocument' to the 'VFS'
+openVFS :: VFS -> J.Message 'J.TextDocumentDidOpen -> (VFS, [String])
 openVFS vfs (J.NotificationMessage _ _ params) =
   let J.DidOpenTextDocumentParams
          (J.TextDocumentItem uri _ version text) = params
@@ -107,7 +108,7 @@ openVFS vfs (J.NotificationMessage _ _ params) =
 -- ---------------------------------------------------------------------
 
 -- ^ Applies a 'DidChangeTextDocumentNotification' to the 'VFS'
-changeFromClientVFS :: VFS -> J.DidChangeTextDocumentNotification -> (VFS,[String])
+changeFromClientVFS :: VFS -> J.Message 'J.TextDocumentDidChange -> (VFS,[String])
 changeFromClientVFS vfs (J.NotificationMessage _ _ params) =
   let
     J.DidChangeTextDocumentParams vid (J.List changes) = params
@@ -129,7 +130,7 @@ updateVFS f vfs@VFS{vfsMap} = vfs { vfsMap = f vfsMap }
 -- ---------------------------------------------------------------------
 
 -- ^ Applies the changes from a 'ApplyWorkspaceEditRequest' to the 'VFS'
-changeFromServerVFS :: VFS -> J.ApplyWorkspaceEditRequest -> IO VFS
+changeFromServerVFS :: VFS -> J.Message 'J.WorkspaceApplyEdit -> IO VFS
 changeFromServerVFS initVfs (J.RequestMessage _ _ _ params) = do
   let J.ApplyWorkspaceEditParams _label edit = params
       J.WorkspaceEdit mChanges mDocChanges = edit
@@ -201,7 +202,7 @@ persistFileVFS vfs uri =
 
 -- ---------------------------------------------------------------------
 
-closeVFS :: VFS -> J.DidCloseTextDocumentNotification -> (VFS, [String])
+closeVFS :: VFS -> J.Message 'J.TextDocumentDidClose -> (VFS, [String])
 closeVFS vfs (J.NotificationMessage _ _ params) =
   let J.DidCloseTextDocumentParams (J.TextDocumentIdentifier uri) = params
   in (updateVFS (Map.delete (J.toNormalizedUri uri)) vfs,["Closed: " ++ show uri])

src/Language/LSP/Server/Core.hs

@@ -276,7 +276,7 @@ data ServerDefinition config = forall m a.
       -- callback should return either the parsed configuration data or an error
       -- indicating what went wrong. The parsed configuration object will be
       -- stored internally and can be accessed via 'config'.
-    , doInitialize :: LanguageContextEnv config -> InitializeRequest -> IO (Either ResponseError a)
+    , doInitialize :: LanguageContextEnv config -> Message Initialize -> IO (Either ResponseError a)
       -- ^ Called *after* receiving the @initialize@ request and *before*
       -- returning the response. This callback will be invoked to offer the
       -- language server implementation the chance to create any processes or

src/Language/LSP/Server/Processing.hs

@@ -320,7 +320,7 @@ handle' mAction m msg = do
       | "$/" `T.isPrefixOf` method = True
     isOptionalNotification _  = False
 
-progressCancelHandler :: WorkDoneProgressCancelNotification -> LspM config ()
+progressCancelHandler :: Message WindowWorkDoneProgressCancel -> LspM config ()
 progressCancelHandler (NotificationMessage _ _ (WorkDoneProgressCancelParams tid)) = do
   mact <- getsState $ Map.lookup tid . progressCancel . resProgressData
   case mact of
@@ -339,7 +339,7 @@ shutdownRequestHandler = \_req k -> do
 
 
 
-handleConfigChange :: DidChangeConfigurationNotification -> LspM config ()
+handleConfigChange :: Message WorkspaceDidChangeConfiguration -> LspM config ()
 handleConfigChange req = do
   parseConfig <- LspT $ asks resParseConfig
   res <- liftIO $ parseConfig (req ^. LSP.params . LSP.settings)

test/JsonSpec.hs

@@ -50,7 +50,7 @@ jsonSpec = do
         --  (propertyJsonRoundtrip :: ResponseMessage J.Value -> Property)
   describe "JSON decoding regressions" $
     it "CompletionItem" $
-      (J.decode "{\"jsonrpc\":\"2.0\",\"result\":[{\"label\":\"raisebox\"}],\"id\":1}" :: Maybe CompletionResponse)
+      (J.decode "{\"jsonrpc\":\"2.0\",\"result\":[{\"label\":\"raisebox\"}],\"id\":1}" :: Maybe (ResponseMessage 'TextDocumentCompletion))
         `shouldNotBe` Nothing