Merge pull request microsoft#7371 from Microsoft/checkForWatchFile

mhegazy · mhegazy · commit 24c47f18ade5 · 2016-03-03T10:44:26.000-08:00
Fix microsoft#7362: check for --watchFile in tsconfig.json as well as on the c…
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -386,6 +386,10 @@ namespace ts {
                 sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 return;
             }
+            if (isWatchSet(configParseResult.options) && !sys.watchFile) {
+                reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), /* compilerHost */ undefined);
+                sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
+            }
             return configParseResult;
         }
 
@@ -445,7 +449,7 @@ namespace ts {
             }
             // Use default host function
             const sourceFile = hostGetSourceFile(fileName, languageVersion, onError);
-            if (sourceFile && isWatchSet(compilerOptions)) {
+            if (sourceFile && isWatchSet(compilerOptions) && sys.watchFile) {
                 // Attach a file watcher
                 const filePath = toPath(sourceFile.fileName, sys.getCurrentDirectory(), createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
                 sourceFile.fileWatcher = sys.watchFile(filePath, (fileName: string, removed?: boolean) => sourceFileChanged(sourceFile, removed));

Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,10 @@ namespace ts {`
`386`	`386`	`sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`
`387`	`387`	`return;`
`388`	`388`	`}`
	`389`	`+ if (isWatchSet(configParseResult.options) && !sys.watchFile) {`
	`390`	`+ reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), /* compilerHost */ undefined);`
	`391`	`+ sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`
	`392`	`+ }`
`389`	`393`	`return configParseResult;`
`390`	`394`	`}`
`391`	`395`
`@@ -445,7 +449,7 @@ namespace ts {`
`445`	`449`	`}`
`446`	`450`	`// Use default host function`
`447`	`451`	`const sourceFile = hostGetSourceFile(fileName, languageVersion, onError);`
`448`		`- if (sourceFile && isWatchSet(compilerOptions)) {`
	`452`	`+ if (sourceFile && isWatchSet(compilerOptions) && sys.watchFile) {`
`449`	`453`	`// Attach a file watcher`
`450`	`454`	`const filePath = toPath(sourceFile.fileName, sys.getCurrentDirectory(), createGetCanonicalFileName(sys.useCaseSensitiveFileNames));`
`451`	`455`	`sourceFile.fileWatcher = sys.watchFile(filePath, (fileName: string, removed?: boolean) => sourceFileChanged(sourceFile, removed));`