From ffa64e8c4f1ca31263e0e16e299b0542f633fc65 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 16 Nov 2017 11:16:39 -0800
Subject: [PATCH] Set program as affected if emitting/diagnostics for whole
 program

---
 src/compiler/builder.ts                          | 16 +++++++++++-----
 .../baselines/reference/api/tsserverlibrary.d.ts |  2 +-
 tests/baselines/reference/api/typescript.d.ts    |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
index 40aabb04baa..69f60bb1708 100644
--- a/src/compiler/builder.ts
+++ b/src/compiler/builder.ts
@@ -334,8 +334,8 @@ namespace ts {
         /**
          * Returns the result with affected file
          */
-        function toAffectedFileResult<T>(result: T, affectedFile?: SourceFile): AffectedFileResult<T> {
-            return { result, affectedFile };
+        function toAffectedFileResult<T>(result: T, affected: SourceFile | Program): AffectedFileResult<T> {
+            return { result, affected };
         }
 
         /**
@@ -350,7 +350,10 @@ namespace ts {
             }
             else if (affectedFile === programOfThisState) {
                 // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
-                return toAffectedFileResult(programOfThisState.emit(/*targetSourceFile*/ undefined, writeFileCallback, cancellationToken, /*emitOnlyDtsFiles*/ false, customTransformers));
+                return toAffectedFileResult(
+                    programOfThisState.emit(/*targetSourceFile*/ undefined, writeFileCallback, cancellationToken, /*emitOnlyDtsFiles*/ false, customTransformers),
+                    programOfThisState
+                );
             }
 
             // Emit the affected file
@@ -374,7 +377,10 @@ namespace ts {
                 }
                 else if (affectedFile === programOfThisState) {
                     // When whole program is affected, get all semantic diagnostics (eg when --out or --outFile is specified)
-                    return toAffectedFileResult(programOfThisState.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken));
+                    return toAffectedFileResult(
+                        programOfThisState.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken),
+                        programOfThisState
+                    );
                 }
 
                 // Get diagnostics for the affected file if its not ignored
@@ -693,7 +699,7 @@ namespace ts {
         text: string;
     }
 
-    export type AffectedFileResult<T> = { result: T; affectedFile?: SourceFile; } | undefined;
+    export type AffectedFileResult<T> = { result: T; affected: SourceFile | Program; } | undefined;
 
     export interface BuilderOptions {
         getCanonicalFileName: (fileName: string) => string;
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index e5ee4d8db6c..de738e7cbc0 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -3773,7 +3773,7 @@ declare namespace ts {
     }
     type AffectedFileResult<T> = {
         result: T;
-        affectedFile?: SourceFile;
+        affected: SourceFile | Program;
     } | undefined;
     interface BuilderOptions {
         getCanonicalFileName: (fileName: string) => string;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index bd1eff0be6f..974bc043d3f 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -3720,7 +3720,7 @@ declare namespace ts {
     }
     type AffectedFileResult<T> = {
         result: T;
-        affectedFile?: SourceFile;
+        affected: SourceFile | Program;
     } | undefined;
     interface BuilderOptions {
         getCanonicalFileName: (fileName: string) => string;