Merge pull request #1446 from samoht/fix-describe-bug

Fix `mirage describe` display bug
mirage · Jun 29, 2023 · 6fed8c0 · 6fed8c0
2 parents 8fc7fca + b98fa74
commit 6fed8c0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/lib/functoria/info.ml b/lib/functoria/info.ml
@@ -95,7 +95,7 @@ let pp verbose ppf ({ name; keys; context; output; _ } as t) =
   in
   let list = Fmt.iter ~sep:(Fmt.any ",@ ") List.iter Fmt.string in
   show "Name" Fmt.string name;
-  show "Keys" ~newline:(verbose && output <> None) (Key.pps context) keys;
+  show "Keys" ~newline:(verbose || output <> None) (Key.pps context) keys;
   let () =
     match output with
     | None -> ()

diff --git a/test/functoria/e2e/build.t b/test/functoria/e2e/build.t
@@ -64,7 +64,8 @@ Test `--output`:
                      Keys      
                        hello=Hello World! (default),
                        vote=cat (default),
-                       warn_error=false (default)Output     toto
+                       warn_error=false (default)
+                     Output     toto
   config.exe: [INFO] dune build --root .
   $ ls -a app/
   .

diff --git a/test/functoria/e2e/clean.t b/test/functoria/e2e/clean.t
@@ -83,7 +83,8 @@ Check that clean works with `--output`:
                      Keys      
                        hello=Hello World! (default),
                        vote=cat (default),
-                       warn_error=false (default)Output     toto
+                       warn_error=false (default)
+                     Output     toto
   test.exe: [INFO] Skipped ./app
   test.exe: [INFO] Skipped ./help.exe
   test.exe: [INFO] Skipped ./lib

diff --git a/test/functoria/e2e/describe.t b/test/functoria/e2e/describe.t
@@ -23,5 +23,6 @@ Test that `describe` works as expected:
   Keys      
     hello=Hello World! (default),
     vote=cat (default),
-    warn_error=false (default)Libraries  fmt, functoria-runtime
+    warn_error=false (default)
+  Libraries  fmt, functoria-runtime
   Packages   fmt { ?monorepo }, functoria-runtime { ?monorepo }