Refactor to allow more code actions later.

Author: cristianoc

analysis/src/Commands.ml

@@ -356,16 +356,25 @@ let test ~path =
             SemanticTokens.command ~debug:true
               ~emitter:(SemanticTokens.Token.createEmitter ())
               ~path
-          | "xfm" -> (
+          | "xfm" ->
             print_endline
               ("Xform " ^ path ^ " " ^ string_of_int line ^ ":"
              ^ string_of_int col);
-            match Xform.command ~currentFile:path ~pos:(line, col) with
-            | Some (range, newText) ->
-              Printf.printf "Hit IfThenElse %s newText:\n%s\n"
-                (Protocol.stringifyRange range)
-                newText
-            | None -> ())
+            let codeActions =
+              Xform.extractCodeActions ~path ~pos:(line, col) ~currentFile:path
+            in
+            codeActions
+            |> List.iter (fun codeAction ->
+                   match codeAction with
+                   | {
+                    Protocol.title;
+                    edit = {documentChanges = [{edits = [{range; newText}]}]};
+                   } ->
+                     Printf.printf "Hit %s %s\nnewText:\n%s\n" title
+                       (Protocol.stringifyRange range)
+                       newText
+                   | _ -> assert false
+                   (* TODO *))
           | _ -> ());
           print_newline ())
     in

analysis/src/Xform.ml

@@ -168,22 +168,18 @@ let diff ~filename ~newContents =
     let newLines = List.rev newR in
     (firstLineDifferent, lastLineEqual, newLines)
 
-let command ~currentFile ~pos =
-  if Filename.check_suffix currentFile ".res" then
-    let structure, printExpr = parse ~filename:currentFile in
-    match IfThenElse.xform ~pos structure with
-    | None -> None
-    | Some newExpr ->
-      let range = rangeOfLoc newExpr.pexp_loc in
-      let newText = printExpr ~range newExpr in
-      Some (range, newText)
-  else None
-
 let extractCodeActions ~path ~pos ~currentFile =
-  match command ~currentFile ~pos with
-  | Some (range, newText) ->
-    [
-      CodeActions.make ~title:"Replace with switch" ~kind:RefactorRewrite
-        ~uri:path ~newText ~range;
-    ]
-  | None -> []
+  let codeActions = ref [] in
+  (if Filename.check_suffix currentFile ".res" then
+   let structure, printExpr = parse ~filename:currentFile in
+   match IfThenElse.xform ~pos structure with
+   | None -> ()
+   | Some newExpr ->
+     let range = rangeOfLoc newExpr.pexp_loc in
+     let newText = printExpr ~range newExpr in
+     let codeAction =
+       CodeActions.make ~title:"Replace with switch" ~kind:RefactorRewrite
+         ~uri:path ~newText ~range
+     in
+     codeActions := codeAction :: !codeActions);
+  !codeActions

analysis/tests/src/expected/Xform.res.txt

@@ -1,5 +1,6 @@
 Xform tests/src/Xform.res 6:5
-Hit IfThenElse {"start": {"line": 6, "character": 0}, "end": {"line": 11, "character": 1}} newText:
+Hit Replace with switch {"start": {"line": 6, "character": 0}, "end": {"line": 11, "character": 1}}
+newText:
 switch kind {
 | First =>
   // ^xfm
@@ -8,7 +9,8 @@ switch kind {
 }
 
 Xform tests/src/Xform.res 13:15
-Hit IfThenElse {"start": {"line": 13, "character": 0}, "end": {"line": 13, "character": 79}} newText:
+Hit Replace with switch {"start": {"line": 13, "character": 0}, "end": {"line": 13, "character": 79}}
+newText:
 switch kind {
 | #kind("First", {name: "abc", age: 3}) => ret("First")
 | _ => ret("Not First")