flow ls --strip-root --json --explain was broken

Summary: The `--explain` flag was returning the wrong results when `--strip-root` and `--json` were passed through. Reviewed By: samwgoldman Differential Revision: D5881809 fbshipit-source-id: 3d215b14377454901c547d414868501620b186a2
facebook · Sep 22, 2017 · 8708e4c · 8708e4c
1 parent 2b3ae53
commit 8708e4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/newtests/ls_command/test.js b/newtests/ls_command/test.js
@@ -155,22 +155,22 @@ export default suite(({addFile, flowCmd, removeFile}) => [
         `
           {
             "../other/explicitly_included.js": {
-              "explanation": "ImplicitlyIgnored"
+              "explanation": "ExplicitlyIncluded"
             },
             "../other/implicitly_ignored.js": {
               "explanation": "ImplicitlyIgnored"
             },
             "explicit_lib.js": {
-              "explanation": "ImplicitlyIgnored"
+              "explanation": "ExplicitLib"
             },
             "explicitly_ignored.js": {
-              "explanation": "ImplicitlyIgnored"
+              "explanation": "ExplicitlyIgnored"
             },
             "flow-typed/implicit_lib.js": {
-              "explanation": "ImplicitlyIgnored"
+              "explanation": "ImplicitLib"
             },
             "implicitly_included.js": {
-              "explanation": "ImplicitlyIgnored"
+              "explanation": "ImplicitlyIncluded"
             }
           }
         `,

diff --git a/src/commands/lsCommand.ml b/src/commands/lsCommand.ml
@@ -196,8 +196,8 @@ let main
       if reason
       then
         files
-        |> List.map normalize_filename
         |> List.map (is_included ~root ~options ~libs)
+        |> List.map (fun (f, r) -> normalize_filename f, r)
         |> json_of_files_with_explanations
       else JSON_Array (
         List.map (fun f -> JSON_String (normalize_filename f)) files