Use isWatchSet to test for options.watch

mhegazy · mhegazy · commit 523529cc5551 · 2016-04-04T14:51:16.000-07:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -658,7 +658,7 @@ namespace ts {
                 const start = new Date().getTime();
                 ensureDirectoriesExist(getDirectoryPath(normalizePath(fileName)));
 
-                if (options.watch && sys.createHash && sys.getModifiedTime) {
+                if (isWatchSet(options) && sys.createHash && sys.getModifiedTime) {
                     writeFileIfUpdated(fileName, data, writeByteOrderMark);
                 }
                 else {
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -240,11 +240,6 @@ namespace ts {
         return typeof JSON === "object" && typeof JSON.parse === "function";
     }
 
-    function isWatchSet(options: CompilerOptions) {
-        // Firefox has Object.prototype.watch
-        return options.watch && options.hasOwnProperty("watch");
-    }
-
     export function executeCommandLine(args: string[]): void {
         const commandLine = parseCommandLine(args);
         let configFileName: string;                                 // Configuration file name (if any)
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2642,6 +2642,11 @@ namespace ts {
         }
         return carriageReturnLineFeed;
     }
+
+    export function isWatchSet(options: CompilerOptions) {
+        // Firefox has Object.prototype.watch
+        return options.watch && options.hasOwnProperty("watch");
+    }
 }
 
 namespace ts {

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ namespace ts {`
`658`	`658`	`const start = new Date().getTime();`
`659`	`659`	`ensureDirectoriesExist(getDirectoryPath(normalizePath(fileName)));`
`660`	`660`
`661`		`- if (options.watch && sys.createHash && sys.getModifiedTime) {`
	`661`	`+ if (isWatchSet(options) && sys.createHash && sys.getModifiedTime) {`
`662`	`662`	`writeFileIfUpdated(fileName, data, writeByteOrderMark);`
`663`	`663`	`}`
`664`	`664`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -2642,6 +2642,11 @@ namespace ts {`
`2642`	`2642`	`}`
`2643`	`2643`	`return carriageReturnLineFeed;`
`2644`	`2644`	`}`
	`2645`	`+`
	`2646`	`+ export function isWatchSet(options: CompilerOptions) {`
	`2647`	`+ // Firefox has Object.prototype.watch`
	`2648`	`+ return options.watch && options.hasOwnProperty("watch");`
	`2649`	`+ }`
`2645`	`2650`	`}`
`2646`	`2651`
`2647`	`2652`	`namespace ts {`