Use Uri instead of Text in DocumentChange

Author: banacorn

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

@@ -58,7 +58,7 @@ deriveJSON lspOptions ''CreateFileOptions
 data CreateFile =
   CreateFile
     { -- | The resource to create.
-      _uri      :: Text
+      _uri      :: Uri
       -- | Additional options
     , _options  :: Maybe CreateFileOptions
     } deriving (Show, Read, Eq)
@@ -95,9 +95,9 @@ deriveJSON lspOptions ''RenameFileOptions
 data RenameFile =
   RenameFile
     { -- | The old (existing) location.
-      _oldUri   :: Text
+      _oldUri   :: Uri
       -- | The new location.
-    , _newUri   :: Text
+    , _newUri   :: Uri
       -- | Rename options.
     , _options  :: Maybe RenameFileOptions
     } deriving (Show, Read, Eq)
@@ -136,7 +136,7 @@ deriveJSON lspOptions ''DeleteFileOptions
 data DeleteFile =
   DeleteFile
     { -- | The file to delete.
-      _uri      :: Text
+      _uri      :: Uri
       -- | Delete options.
     , _options  :: Maybe DeleteFileOptions
     } deriving (Show, Read, Eq)

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

@@ -133,7 +133,7 @@ applyCreateFile :: J.CreateFile -> VFS -> VFS
 applyCreateFile (J.CreateFile uri options) = 
   updateVFS $ Map.insertWith 
                 (\ new old -> if shouldOverwrite then new else old)
-                (J.toNormalizedUri (J.Uri uri))
+                (J.toNormalizedUri uri)
                 (VirtualFile 0 0 (Rope.fromText ""))
   where 
     shouldOverwrite :: Bool 
@@ -151,8 +151,8 @@ applyCreateFile (J.CreateFile uri options) =
 
 applyRenameFile :: J.RenameFile -> VFS -> VFS
 applyRenameFile (J.RenameFile oldUri' newUri' options) vfs = 
-  let oldUri = J.toNormalizedUri (J.Uri oldUri')
-      newUri = J.toNormalizedUri (J.Uri newUri')
+  let oldUri = J.toNormalizedUri oldUri'
+      newUri = J.toNormalizedUri newUri'
   in  case Map.lookup oldUri (vfsMap vfs) of 
         -- nothing to rename 
         Nothing -> vfs 
@@ -179,7 +179,7 @@ applyRenameFile (J.RenameFile oldUri' newUri' options) vfs =
 -- NOTE: we are ignoring the `recursive` option here because we don't know which file is a directory
 applyDeleteFile :: J.DeleteFile -> VFS -> VFS
 applyDeleteFile (J.DeleteFile uri _options) = 
-  updateVFS $ Map.delete (J.toNormalizedUri (J.Uri uri))
+  updateVFS $ Map.delete (J.toNormalizedUri uri)
 
 
 applyTextDocumentEdit :: J.TextDocumentEdit -> VFS -> IO VFS