fix jsonnetfmt output when processing stdin with --test

Author: johnbartholomew

cmd/jsonnetfmt.cpp

@@ -123,8 +123,8 @@ static ArgStatus process_args(int argc, const char **argv, JsonnetConfig *config
         } else if (arg == "--") {
             // All subsequent args are not options.
             while ((++i) < args.size())
-                remaining_args.push_back(args[i]);          
-            break;  
+                remaining_args.push_back(args[i]);
+            break;
         } else if (arg == "-i" || arg == "--in-place") {
             config->fmtInPlace = true;
         } else if (arg == "--test") {
@@ -234,10 +234,11 @@ int main(int argc, const char **argv)
             bool changed_files = false;
             assert(config.inputFiles.size() >= 1);
             for (std::string &inputFile : config.inputFiles) {
+                const bool input_stdin = inputFile == "-";
                 if (config.fmtInPlace) {
                     output_file = inputFile;
 
-                    if (inputFile == "-") {
+                    if (input_stdin) {
                         std::cerr << "ERROR: cannot use --in-place with stdin" << std::endl;
                         jsonnet_destroy(vm);
                         return EXIT_FAILURE;
@@ -265,31 +266,25 @@ int main(int argc, const char **argv)
                     return EXIT_FAILURE;
                 }
 
-                if (config.fmtTest) {
-                    // Check the output matches the input.
-                    bool ok = output == input;
+                // Write output Jsonnet only if there is a difference between input and output
+                bool different = output != input;
+                if (config.fmtInPlace && different) {
+                    bool successful = write_output_file(output, output_file);
                     jsonnet_realloc(vm, output, 0);
-                    if (!ok) {
-                        if (inputFile != "-" && !config.filenameIsCode) {
-                            std::cout << inputFile << std::endl;
-                        }
-                        changed_files = true;
+                    if (!successful) {
+                        jsonnet_destroy(vm);
+                        return EXIT_FAILURE;
                     }
                 } else {
-                    // Write output Jsonnet only if there is a difference between input and output
-                    bool different = output != input;
-                    if (different) {
-                        bool successful = write_output_file(output, output_file);
-                        jsonnet_realloc(vm, output, 0);
-                        if (!successful) {
-                            jsonnet_destroy(vm);
-                            return EXIT_FAILURE;
-                        }
-                        if (inputFile != "-" && !config.filenameIsCode) {
-                            std::cout << inputFile << std::endl;
-                        }
-                    } else {
-                        jsonnet_realloc(vm, output, 0);
+                    jsonnet_realloc(vm, output, 0);
+                }
+
+                // If we're not processing stdin or some other unnamed thing, then
+                // print the names of any changed or unclean files.
+                if (different) {
+                    changed_files = true;
+                    if (!input_stdin && !config.filenameIsCode) {
+                        std::cout << inputFile << std::endl;
                     }
                 }
             }

test_cmd/fmt_simple_test4.golden.stdout

@@ -1 +0,0 @@
-test_badfmt.jsonnet

test_cmd/fmt_simple_test4.stdin

@@ -0,0 +1,5 @@
+{
+  a: 1,
+  b: 2,
+  c: 3,
+}

test_cmd/fmt_simple_test5.golden.stdout

@@ -0,0 +1,3 @@
+{a:1, b:
+
+2,['c']:3}

test_cmd/fmt_simple_test5.stdin

@@ -0,0 +1 @@
+test_badfmt.jsonnet

test_cmd/fmt_simple_test6.golden.stdout

@@ -27,8 +27,6 @@ source "${DIR}/cmd_tests.source"
 OUT_DIR=$(mktemp -d)
 trap "rm -rf -- ${OUT_DIR}" EXIT INT TERM
 
->&2 echo "output dir: ${OUT_DIR}"
-
 pushd "${DIR}"
 
 [[ -d "${OUT_DIR}" ]] || {
@@ -179,7 +177,9 @@ do_fmt_test "fmt_double_dash" 0 -e -- -1
 do_fmt_test "fmt_simple_test1" 0 --test "test.jsonnet"
 do_fmt_test "fmt_simple_test2" 2 --test -e "{a:1,b:2,c:3}"
 do_fmt_test "fmt_simple_test3" 0 --test -e $'42\n'
-do_fmt_test "fmt_simple_test4" 2 --test "test.jsonnet" "test_badfmt.jsonnet"
+do_fmt_test "fmt_simple_test4" 0 --test -
+do_fmt_test "fmt_simple_test5" 2 --test -
+do_fmt_test "fmt_simple_test6" 2 --test "test.jsonnet" "test_badfmt.jsonnet"
 
 SED_STDOUT="${SED_REPLACE_OUT_DIR}"
 if mkdir -p "${OUT_DIR}/fmt_inplace" && cp "test.jsonnet" "test_badfmt.jsonnet" "${OUT_DIR}/fmt_inplace/"; then