Skip to content

Commit

Permalink
Add a flag to substitute environments (#126)
Browse files Browse the repository at this point in the history
  • Loading branch information
rvantonder committed Oct 29, 2019
1 parent caf3d7c commit adea33d
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 0 deletions.
31 changes: 31 additions & 0 deletions src/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,34 @@ let list_supported_languages_and_exit () =
Format.printf "%s%!" list;
exit 0

let substitute_environment_only_and_exit anonymous_arguments json_environment =
let rewrite_template =
match anonymous_arguments with
| Some { rewrite_template; _ } -> rewrite_template
| None ->
Format.eprintf
"When the -substitute-only argument is active, a rewrite template must \
be in the second anonymous argument. For example: `comby 'ignored' \
'rewrite_template' -substitute-only 'JSON-for-the-environment'`.";
exit 1
in
match Yojson.Safe.from_string (Option.value_exn json_environment) with
| json ->
begin
Match.Environment.of_yojson json
|> function
| Ok environment ->
let substituted, _ = Rewriter.Rewrite_template.substitute rewrite_template environment in
Format.printf "%s@." substituted;
exit 0
| Error err ->
Format.eprintf "Error, could not convert input to environment: %s@." err;
exit 1
end
| exception Yojson.Json_error err ->
Format.eprintf "Error, could not parse JSON to environment: %s@." err;
exit 1

let base_command_parameters : (unit -> 'result) Command.Param.t =
[%map_open
(* flags. *)
Expand All @@ -94,6 +122,7 @@ let base_command_parameters : (unit -> 'result) Command.Param.t =
and dump_statistics = flag "statistics" ~aliases:["stats"] no_arg ~doc:"Dump statistics to stderr"
and stdin = flag "stdin" no_arg ~doc:"Read source from stdin"
and stdout = flag "stdout" no_arg ~doc:"Print changed content to stdout. Useful to editors for reading in changed content."
and substitute_environment = flag "substitute-only" (optional string) ~doc:"JSON Substitute the environment specified in JSON into the rewrite template and output the substitution. Do not match or rewrite anything (match templates and inputs are ignored)."
and diff = flag "diff" no_arg ~doc:"Output diff"
and color = flag "color" no_arg ~doc:"Color matches or replacements (patience diff)."
and newline_separated_rewrites = flag "newline-separated" no_arg ~doc:"Instead of rewriting in place, output rewrites separated by newlines."
Expand Down Expand Up @@ -139,6 +168,8 @@ let base_command_parameters : (unit -> 'result) Command.Param.t =
{ match_template; rewrite_template; file_filters })
in
if list then list_supported_languages_and_exit ();
if Option.is_some substitute_environment then
substitute_environment_only_and_exit anonymous_arguments substitute_environment;
let interactive_review =
let default_editor =
let f = Option.some in
Expand Down
26 changes: 26 additions & 0 deletions test/test_cli.ml
Original file line number Diff line number Diff line change
Expand Up @@ -916,3 +916,29 @@ let%expect_test "dump_stats" =
number_of_files lines_of_code number_of_matches
| Error _ -> print_string "Unexpected error");
[%expect_exact {|number_of_files: 1, lines_of_code: 1, number_of_matches: 1|}]

let%expect_test "substitute_bad_parse" =
let source = "dont care" in
let match_template = "dont care" in
let rewrite_template = "dont care" in
let command_args = Format.sprintf "%s %s -substitute 'json'" match_template rewrite_template in
let command = Format.sprintf "%s %s" binary_path command_args in
read_expect_stdin_and_stdout command source
|> print_string;
[%expect_exact {|Error, could not parse JSON to environment: Line 1, bytes 0-4:
Invalid token 'json'
|}]

let%expect_test "substitute_ok" =
let source = "a match1 c d a match2 c d" in
let match_template = "ignored" in
let rewrite_template = ":[1] :[2]" in
let environment = {|[{"variable":"1","value":"hole_1"},{"variable":"2","value":"hole_2"}]|} in
let command_args =
Format.sprintf "'%s' '%s' -stdin -match-only -matcher .txt -substitute '%s'" match_template rewrite_template environment
in
let command = Format.sprintf "%s %s" binary_path command_args in
read_expect_stdin_and_stdout command source
|> print_string;
[%expect_exact {|hole_1 hole_2
|}]

0 comments on commit adea33d

Please sign in to comment.