rename nits

Author: cristianoc

analysis/src/Commands.ml

@@ -200,13 +200,12 @@ let rename ~path ~line ~col ~newName =
           |> List.map (fun (uri, _) ->
                  let path = Uri2.toPath uri in
                  let dir = Filename.dirname path in
-                 let ext = Filename.extension path in
-                 let sep = Filename.dir_sep in
-                 let newPath = dir ^ sep ^ newName ^ ext in
+                 let newPath =
+                   Filename.concat dir (newName ^ Filename.extension path)
+                 in
                  let newUri = Uri2.fromPath newPath in
                  Protocol.
                    {
-                     kind = `rename;
                      oldUri = uri |> Uri2.toString;
                      newUri = newUri |> Uri2.toString;
                    })

analysis/src/Protocol.ml

@@ -18,7 +18,7 @@ type location = {uri : string; range : range}
 
 type documentSymbolItem = {name : string; kind : int; location : location}
 
-type renameFile = {kind : [`rename]; oldUri : string; newUri : string}
+type renameFile = {oldUri : string; newUri : string}
 
 type textEdit = {range : range; newText : string}
 
@@ -80,14 +80,13 @@ let stringifyDocumentSymbolItem i =
     (Json.escape i.name) i.kind
     (stringifyLocation i.location)
 
-let stringifyRenameFile rf =
+let stringifyRenameFile {oldUri; newUri} =
   Printf.sprintf {|{
-  "kind": "%s",
+  "kind": "rename",
   "oldUri": "%s",
   "newUri": "%s"
 }|}
-    (match rf.kind with `rename -> "rename")
-    (Json.escape rf.oldUri) (Json.escape rf.newUri)
+    (Json.escape oldUri) (Json.escape newUri)
 
 let stringifyTextEdit te =
   Printf.sprintf {|{