Move setTimeout to sys (microsoft#11746)

zhengbli · web-flow · commit 3f234f2e7f17 · 2016-10-20T11:30:05.000-07:00
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -34,6 +34,8 @@ namespace ts {
         realpath?(path: string): string;
         /*@internal*/ getEnvironmentVariable(name: string): string;
         /*@internal*/ tryEnableSourceMapsForHost?(): void;
+        setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
+        clearTimeout?(timeoutId: any): void;
     }
 
     export interface FileWatcher {
@@ -560,7 +562,9 @@ namespace ts {
                     catch (e) {
                         // Could not enable source maps.
                     }
-                }
+                },
+                setTimeout,
+                clearTimeout
             };
             return nodeSystem;
         }
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -250,8 +250,8 @@ namespace ts {
         let compilerOptions: CompilerOptions;                       // Compiler options for compilation
         let compilerHost: CompilerHost;                             // Compiler host
         let hostGetSourceFile: typeof compilerHost.getSourceFile;   // getSourceFile method from default host
-        let timerHandleForRecompilation: number;                    // Handle for 0.25s wait timer to trigger recompilation
-        let timerHandleForDirectoryChanges: number;                 // Handle for 0.25s wait timer to trigger directory change handler
+        let timerHandleForRecompilation: any;                    // Handle for 0.25s wait timer to trigger recompilation
+        let timerHandleForDirectoryChanges: any;                 // Handle for 0.25s wait timer to trigger directory change handler
 
         // This map stores and reuses results of fileExists check that happen inside 'createProgram'
         // This allows to save time in module resolution heavy scenarios when existence of the same file might be checked multiple times.
@@ -503,10 +503,14 @@ namespace ts {
         }
 
         function startTimerForHandlingDirectoryChanges() {
+            if (!sys.setTimeout || !sys.clearTimeout) {
+                return;
+            }
+
             if (timerHandleForDirectoryChanges) {
-                clearTimeout(timerHandleForDirectoryChanges);
+                sys.clearTimeout(timerHandleForDirectoryChanges);
             }
-            timerHandleForDirectoryChanges = setTimeout(directoryChangeHandler, 250);
+            timerHandleForDirectoryChanges = sys.setTimeout(directoryChangeHandler, 250);
         }
 
         function directoryChangeHandler() {
@@ -525,10 +529,14 @@ namespace ts {
         // operations (such as saving all modified files in an editor) a chance to complete before we kick
         // off a new compilation.
         function startTimerForRecompilation() {
+            if (!sys.setTimeout || !sys.clearTimeout) {
+                return;
+            }
+
             if (timerHandleForRecompilation) {
-                clearTimeout(timerHandleForRecompilation);
+                sys.clearTimeout(timerHandleForRecompilation);
             }
-            timerHandleForRecompilation = setTimeout(recompile, 250);
+            timerHandleForRecompilation = sys.setTimeout(recompile, 250);
         }
 
         function recompile() {

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ namespace ts {`
`34`	`34`	`realpath?(path: string): string;`
`35`	`35`	`/@internal/ getEnvironmentVariable(name: string): string;`
`36`	`36`	`/@internal/ tryEnableSourceMapsForHost?(): void;`
	`37`	`+ setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;`
	`38`	`+ clearTimeout?(timeoutId: any): void;`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`export interface FileWatcher {`
`@@ -560,7 +562,9 @@ namespace ts {`
`560`	`562`	`catch (e) {`
`561`	`563`	`// Could not enable source maps.`
`562`	`564`	`}`
`563`		`- }`
	`565`	`+ },`
	`566`	`+ setTimeout,`
	`567`	`+ clearTimeout`
`564`	`568`	`};`
`565`	`569`	`return nodeSystem;`
`566`	`570`	`}`