From 2d62050b8f63162ac6050998253be61259c78d09 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 20 Sep 2019 14:23:04 -0700
Subject: [PATCH] Show redirected files in --listFiles

---
 src/compiler/watch.ts                                     | 6 +++++-
 src/testRunner/unittests/tsc/declarationEmit.ts           | 2 +-
 ...renced-through-source-and-another-symlinked-package.js | 8 +++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
index 652b85d000d..9634f5477f1 100644
--- a/src/compiler/watch.ts
+++ b/src/compiler/watch.ts
@@ -122,7 +122,11 @@ namespace ts {
     export function listFiles(program: ProgramToEmitFilesAndReportErrors, writeFileName: (s: string) => void) {
         if (program.getCompilerOptions().listFiles) {
             forEach(program.getSourceFiles(), file => {
-                writeFileName(file.fileName);
+                writeFileName(
+                    !file.redirectInfo ?
+                        file.fileName :
+                        `${file.fileName} -> ${file.redirectInfo.redirectTarget.fileName}`
+                );
             });
         }
     }
diff --git a/src/testRunner/unittests/tsc/declarationEmit.ts b/src/testRunner/unittests/tsc/declarationEmit.ts
index 4ec2819a734..75a40debb67 100644
--- a/src/testRunner/unittests/tsc/declarationEmit.ts
+++ b/src/testRunner/unittests/tsc/declarationEmit.ts
@@ -67,7 +67,7 @@ namespace ts {
                     "/plugin-one/node_modules/plugin-two": new vfs.Symlink("/plugin-two"),
                 });
             },
-            commandLineArgs: ["-p", "plugin-one"]
+            commandLineArgs: ["-p", "plugin-one", "--listFiles"]
         });
     });
 }
diff --git a/tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js b/tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js
index c7ccb8014c3..ec612b65f17 100644
--- a/tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js
+++ b/tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js
@@ -1,6 +1,12 @@
 //// [/lib/initial-buildOutput.txt]
-/lib/tsc -p plugin-one
+/lib/tsc -p plugin-one --listFiles
 plugin-one/action.ts(4,14): error TS2742: The inferred type of 'actions' cannot be named without a reference to 'plugin-two/node_modules/typescript-fsa'. This is likely not portable. A type annotation is necessary.
+/lib/lib.d.ts
+/plugin-one/node_modules/typescript-fsa/index.d.ts
+/plugin-one/action.ts
+/plugin-two/node_modules/typescript-fsa/index.d.ts -> /plugin-one/node_modules/typescript-fsa/index.d.ts
+/plugin-two/index.d.ts
+/plugin-one/index.ts
 exitCode:: 1