From 098c9008b88b233819d063a93d5190823eb8c6f8 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 16 May 2019 14:49:53 -0700
Subject: [PATCH] Make more build options internal which correspond to internal
 compiler options Also fix return type of readBuilderProgram

---
 src/compiler/builder.ts                            | 2 +-
 src/compiler/tsbuild.ts                            | 8 ++++----
 tests/baselines/reference/api/tsserverlibrary.d.ts | 6 +-----
 tests/baselines/reference/api/typescript.d.ts      | 6 +-----
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
index 7190407dd8621..d4c2132d36baa 100644
--- a/src/compiler/builder.ts
+++ b/src/compiler/builder.ts
@@ -993,7 +993,7 @@ namespace ts {
         return map;
     }
 
-    export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo): EmitAndSemanticDiagnosticsBuilderProgram & SemanticDiagnosticsBuilderProgram {
+    export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo): EmitAndSemanticDiagnosticsBuilderProgram {
         const fileInfos = createMapFromTemplate(program.fileInfos);
         const state: ReusableBuilderProgramState = {
             fileInfos,
diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts
index 1c1c093bc7a1f..94718a1b3680f 100644
--- a/src/compiler/tsbuild.ts
+++ b/src/compiler/tsbuild.ts
@@ -163,10 +163,10 @@ namespace ts {
         /*@internal*/ watch?: boolean;
         /*@internal*/ help?: boolean;
 
-        preserveWatchOutput?: boolean;
-        listEmittedFiles?: boolean;
-        listFiles?: boolean;
-        pretty?: boolean;
+        /*@internal*/ preserveWatchOutput?: boolean;
+        /*@internal*/ listEmittedFiles?: boolean;
+        /*@internal*/ listFiles?: boolean;
+        /*@internal*/ pretty?: boolean;
         incremental?: boolean;
 
         traceResolution?: boolean;
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 8e78922e63617..0351c6b343aca 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -4449,7 +4449,7 @@ declare namespace ts {
     function createAbstractBuilder(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): BuilderProgram;
 }
 declare namespace ts {
-    function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): (EmitAndSemanticDiagnosticsBuilderProgram & SemanticDiagnosticsBuilderProgram) | undefined;
+    function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
     function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost;
     interface IncrementalProgramOptions<T extends BuilderProgram> {
         rootNames: ReadonlyArray<string>;
@@ -4578,10 +4578,6 @@ declare namespace ts {
         dry?: boolean;
         force?: boolean;
         verbose?: boolean;
-        preserveWatchOutput?: boolean;
-        listEmittedFiles?: boolean;
-        listFiles?: boolean;
-        pretty?: boolean;
         incremental?: boolean;
         traceResolution?: boolean;
         [option: string]: CompilerOptionsValue | undefined;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 3d0df0fabec83..9becdad6aa097 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -4449,7 +4449,7 @@ declare namespace ts {
     function createAbstractBuilder(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): BuilderProgram;
 }
 declare namespace ts {
-    function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): (EmitAndSemanticDiagnosticsBuilderProgram & SemanticDiagnosticsBuilderProgram) | undefined;
+    function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
     function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost;
     interface IncrementalProgramOptions<T extends BuilderProgram> {
         rootNames: ReadonlyArray<string>;
@@ -4578,10 +4578,6 @@ declare namespace ts {
         dry?: boolean;
         force?: boolean;
         verbose?: boolean;
-        preserveWatchOutput?: boolean;
-        listEmittedFiles?: boolean;
-        listFiles?: boolean;
-        pretty?: boolean;
         incremental?: boolean;
         traceResolution?: boolean;
         [option: string]: CompilerOptionsValue | undefined;