Remove startWatching as explicit method from api

sheetalkamat · sheetalkamat · commit 3da47963d51d · 2019-05-02T15:22:07.000-07:00
diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts
@@ -234,6 +234,7 @@ namespace ts {
     export interface SolutionBuilderHostBase<T extends BuilderProgram> extends ProgramHost<T> {
         getModifiedTime(fileName: string): Date | undefined;
         setModifiedTime(fileName: string, date: Date): void;
+        deleteFile(fileName: string): void;
 
         reportDiagnostic: DiagnosticReporter; // Technically we want to move it out and allow steps of actions on Solution, but for now just merge stuff in build host here
         reportSolutionBuilderStatus: DiagnosticReporter;
@@ -247,7 +248,6 @@ namespace ts {
     }
 
     export interface SolutionBuilderHost<T extends BuilderProgram> extends SolutionBuilderHostBase<T> {
-        deleteFile(fileName: string): void;
         reportErrorSummary?: ReportEmitErrorSummary;
     }
 
@@ -267,11 +267,6 @@ namespace ts {
         /*@internal*/ buildNextInvalidatedProject(): void;
     }
 
-    export interface SolutionBuilderWithWatch {
-        build(project?: string, cancellationToken?: CancellationToken): ExitStatus;
-        /*@internal*/ startWatching(): void;
-    }
-
     interface InvalidatedProject {
         project: ResolvedConfigFileName;
         projectPath: ResolvedConfigFilePath;
@@ -294,14 +289,14 @@ namespace ts {
         const host = createProgramHost(system, createProgram) as SolutionBuilderHostBase<T>;
         host.getModifiedTime = system.getModifiedTime ? path => system.getModifiedTime!(path) : returnUndefined;
         host.setModifiedTime = system.setModifiedTime ? (path, date) => system.setModifiedTime!(path, date) : noop;
+        host.deleteFile = system.deleteFile ? path => system.deleteFile!(path) : noop;
         host.reportDiagnostic = reportDiagnostic || createDiagnosticReporter(system);
         host.reportSolutionBuilderStatus = reportSolutionBuilderStatus || createBuilderStatusReporter(system);
         return host;
     }
 
     export function createSolutionBuilderHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system = sys, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportErrorSummary?: ReportEmitErrorSummary) {
         const host = createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) as SolutionBuilderHost<T>;
-        host.deleteFile = system.deleteFile ? path => system.deleteFile!(path) : noop;
         host.reportErrorSummary = reportErrorSummary;
         return host;
     }
@@ -325,7 +320,7 @@ namespace ts {
         return createSolutionBuilderWorker(/*watch*/ false, host, rootNames, defaultOptions);
     }
 
-    export function createSolutionBuilderWithWatch<T extends BuilderProgram>(host: SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilderWithWatch {
+    export function createSolutionBuilderWithWatch<T extends BuilderProgram>(host: SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder {
         return createSolutionBuilderWorker(/*watch*/ true, host, rootNames, defaultOptions);
     }
 
@@ -334,8 +329,8 @@ namespace ts {
      * can dynamically add/remove other projects based on changes on the rootNames' references
      */
     function createSolutionBuilderWorker<T extends BuilderProgram>(watch: false, host: SolutionBuilderHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder;
-    function createSolutionBuilderWorker<T extends BuilderProgram>(watch: true, host: SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilderWithWatch;
-    function createSolutionBuilderWorker<T extends BuilderProgram>(watch: boolean, hostOrHostWithWatch: SolutionBuilderHost<T> | SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder | SolutionBuilderWithWatch {
+    function createSolutionBuilderWorker<T extends BuilderProgram>(watch: true, host: SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder;
+    function createSolutionBuilderWorker<T extends BuilderProgram>(watch: boolean, hostOrHostWithWatch: SolutionBuilderHost<T> | SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder {
         const host = hostOrHostWithWatch as SolutionBuilderHost<T>;
         const hostWithWatch = hostOrHostWithWatch as SolutionBuilderWithWatchHost<T>;
         const currentDirectory = host.getCurrentDirectory();
@@ -395,21 +390,16 @@ namespace ts {
 
         let allProjectBuildPending = true;
         let needsSummary = true;
-    //    let watchAllProjectsPending = watch;
-
-        return watch ?
-            {
-                build,
-                startWatching
-            } :
-            {
-                build,
-                clean,
-                getBuildOrder,
-                getUpToDateStatusOfProject,
-                invalidateProject,
-                buildNextInvalidatedProject,
-            };
+        let watchAllProjectsPending = watch;
+
+        return {
+            build,
+            clean,
+            getBuildOrder,
+            getUpToDateStatusOfProject,
+            invalidateProject,
+            buildNextInvalidatedProject,
+        };
 
         function toPath(fileName: string) {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -1469,6 +1459,10 @@ namespace ts {
                         disableCache();
                         reportErrorSummary();
                     }
+                    if (watchAllProjectsPending) {
+                        watchAllProjectsPending = false;
+                        startWatching();
+                    }
                     break;
                 }
 
diff --git a/src/testRunner/unittests/tsbuildWatchMode.ts b/src/testRunner/unittests/tsbuildWatchMode.ts
@@ -25,7 +25,6 @@ namespace ts.tscWatch {
         const host = createSolutionBuilderWithWatchHost(system);
         const solutionBuilder = ts.createSolutionBuilderWithWatch(host, rootNames, defaultOptions || { watch: true });
         solutionBuilder.build();
-        solutionBuilder.startWatching();
         return solutionBuilder;
     }
 
diff --git a/src/tsc/tsc.ts b/src/tsc/tsc.ts
@@ -207,25 +207,22 @@ namespace ts {
             reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--build"));
             return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
         }
-        if (buildOptions.watch) {
-            reportWatchModeWithoutSysSupport();
-        }
 
         if (buildOptions.watch) {
+            reportWatchModeWithoutSysSupport();
             const buildHost = createSolutionBuilderWithWatchHost(sys, /*createProgram*/ undefined, reportDiagnostic, createBuilderStatusReporter(sys, shouldBePretty(buildOptions)), createWatchStatusReporter(buildOptions));
             updateCreateProgram(buildHost);
             buildHost.afterProgramEmitAndDiagnostics = program => reportStatistics(program.getProgram());
             const builder = createSolutionBuilderWithWatch(buildHost, projects, buildOptions);
             builder.build();
-            return builder.startWatching();
-        }
-        else {
-            const buildHost = createSolutionBuilderHost(sys, /*createProgram*/ undefined, reportDiagnostic, createBuilderStatusReporter(sys, shouldBePretty(buildOptions)), createReportErrorSummary(buildOptions));
-            updateCreateProgram(buildHost);
-            buildHost.afterProgramEmitAndDiagnostics = program => reportStatistics(program.getProgram());
-            const builder = createSolutionBuilder(buildHost, projects, buildOptions);
-            return sys.exit(buildOptions.clean ? builder.clean() : builder.build());
+            return;
         }
+
+        const buildHost = createSolutionBuilderHost(sys, /*createProgram*/ undefined, reportDiagnostic, createBuilderStatusReporter(sys, shouldBePretty(buildOptions)), createReportErrorSummary(buildOptions));
+        updateCreateProgram(buildHost);
+        buildHost.afterProgramEmitAndDiagnostics = program => reportStatistics(program.getProgram());
+        const builder = createSolutionBuilder(buildHost, projects, buildOptions);
+        return sys.exit(buildOptions.clean ? builder.clean() : builder.build());
     }
 
     function createReportErrorSummary(options: CompilerOptions | BuildOptions): ReportEmitErrorSummary | undefined {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ namespace ts.tscWatch {`
`25`	`25`	`const host = createSolutionBuilderWithWatchHost(system);`
`26`	`26`	`const solutionBuilder = ts.createSolutionBuilderWithWatch(host, rootNames, defaultOptions \|\| { watch: true });`
`27`	`27`	`solutionBuilder.build();`
`28`		`- solutionBuilder.startWatching();`
`29`	`28`	`return solutionBuilder;`
`30`	`29`	`}`
`31`	`30`