refactor code action edit

rescript-lang · Apr 25, 2024 · 8174604 · 8174604
1 parent 3eb0e28
commit 8174604
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 112 deletions.
diff --git a/analysis/src/CodeActions.ml b/analysis/src/CodeActions.ml
@@ -7,3 +7,16 @@ let stringifyCodeActions codeActions =
 
 let make ~title ~kind ~edit ~command =
   {Protocol.title; codeActionKind = kind; edit; command}
+
+let makeEdit edits uri =
+  Protocol.
+    {
+      documentChanges =
+        [
+          {
+            textDocument =
+              {version = None; uri = uri |> Uri.fromPath |> Uri.toString};
+            edits;
+          };
+        ];
+    }
diff --git a/analysis/src/Xform.ml b/analysis/src/Xform.ml
@@ -113,22 +113,7 @@ module IfThenElse = struct
       let codeAction =
         CodeActions.make ~title:"Replace with switch" ~kind:RefactorRewrite
           ~command:None
-          ~edit:
-            (Some
-               Protocol.
-                 {
-                   documentChanges =
-                     [
-                       {
-                         textDocument =
-                           {
-                             version = None;
-                             uri = path |> Uri.fromPath |> Uri.toString;
-                           };
-                         edits = [{newText; range}];
-                       };
-                     ];
-                 })
+          ~edit:(Some (CodeActions.makeEdit [{newText; range}] path))
       in
       codeActions := codeAction :: !codeActions
 end
@@ -193,22 +178,7 @@ module AddBracesToFn = struct
       let codeAction =
         CodeActions.make ~title:"Add braces to function" ~kind:RefactorRewrite
           ~command:None
-          ~edit:
-            (Some
-               Protocol.
-                 {
-                   documentChanges =
-                     [
-                       {
-                         textDocument =
-                           {
-                             version = None;
-                             uri = path |> Uri.fromPath |> Uri.toString;
-                           };
-                         edits = [{newText; range}];
-                       };
-                     ];
-                 })
+          ~edit:(Some (CodeActions.makeEdit [{newText; range}] path))
       in
       codeActions := codeAction :: !codeActions
 end
@@ -282,22 +252,7 @@ module AddTypeAnnotation = struct
           let codeAction =
             CodeActions.make ~title:"Add type annotation" ~kind:RefactorRewrite
               ~command:None
-              ~edit:
-                (Some
-                   Protocol.
-                     {
-                       documentChanges =
-                         [
-                           {
-                             textDocument =
-                               {
-                                 version = None;
-                                 uri = path |> Uri.fromPath |> Uri.toString;
-                               };
-                             edits = [{newText; range}];
-                           };
-                         ];
-                     })
+              ~edit:(Some (CodeActions.makeEdit [{newText; range}] path))
           in
           codeActions := codeAction :: !codeActions
         | _ -> ()))
@@ -434,22 +389,7 @@ module ExhaustiveSwitch = struct
           let codeAction =
             CodeActions.make ~command:None ~title:"Exhaustive switch"
               ~kind:RefactorRewrite
-              ~edit:
-                (Some
-                   Protocol.
-                     {
-                       documentChanges =
-                         [
-                           {
-                             textDocument =
-                               {
-                                 version = None;
-                                 uri = path |> Uri.fromPath |> Uri.toString;
-                               };
-                             edits = [{newText; range}];
-                           };
-                         ];
-                     })
+              ~edit:(Some (CodeActions.makeEdit [{newText; range}] path))
           in
           codeActions := codeAction :: !codeActions))
     | Some (Switch {switchExpr; completionExpr; pos}) -> (
@@ -476,22 +416,7 @@ module ExhaustiveSwitch = struct
           let codeAction =
             CodeActions.make ~title:"Exhaustive switch" ~command:None
               ~kind:RefactorRewrite (* ~uri:path ~newText ~range *)
-              ~edit:
-                (Some
-                   Protocol.
-                     {
-                       documentChanges =
-                         [
-                           {
-                             textDocument =
-                               {
-                                 version = None;
-                                 uri = path |> Uri.fromPath |> Uri.toString;
-                               };
-                             edits = [{newText; range}];
-                           };
-                         ];
-                     })
+              ~edit:(Some (CodeActions.makeEdit [{newText; range}] path))
           in
           codeActions := codeAction :: !codeActions))
 end
@@ -589,22 +514,7 @@ module AddDocTemplate = struct
           let codeAction =
             CodeActions.make ~title:"Add Documentation template"
               ~kind:RefactorRewrite ~command:None
-              ~edit:
-                (Some
-                   Protocol.
-                     {
-                       documentChanges =
-                         [
-                           {
-                             textDocument =
-                               {
-                                 version = None;
-                                 uri = path |> Uri.fromPath |> Uri.toString;
-                               };
-                             edits = [{newText; range}];
-                           };
-                         ];
-                     })
+              ~edit:(Some (CodeActions.makeEdit [{newText; range}] path))
           in
           codeActions := codeAction :: !codeActions
         | None -> ())
@@ -690,22 +600,7 @@ module AddDocTemplate = struct
           let codeAction =
             CodeActions.make ~title:"Add Documentation template"
               ~kind:RefactorRewrite ~command:None
-              ~edit:
-                (Some
-                   Protocol.
-                     {
-                       documentChanges =
-                         [
-                           {
-                             textDocument =
-                               {
-                                 version = None;
-                                 uri = path |> Uri.fromPath |> Uri.toString;
-                               };
-                             edits = [{newText; range}];
-                           };
-                         ];
-                     })
+              ~edit:(Some (CodeActions.makeEdit [{newText; range}] path))
           in
           codeActions := codeAction :: !codeActions
         | None -> ())