microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'patch-1' of https://github.com/mihailik/TypeScript into mihailik-patch-1

Browse Source
This commit is contained in:
Mohamed Hegazy
2016-02-23 10:56:19 -08:00
parent e2c95551b3 8aaf923260
commit 555edcddb5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/tsc.ts
View File

@@ -415,7 +415,8 @@ namespace ts {
const compileResult = compile(rootFileNames, compilerOptions, compilerHost);
if (!compilerOptions.watch) {
// Firefox has Object.prototype.watch
if (!compilerOptions.watch || !compilerOptions.hasOwnProperty("watch")) {
return sys.exit(compileResult.exitStatus);
}
@@ -441,7 +442,8 @@ namespace ts {
}
// Use default host function
const sourceFile = hostGetSourceFile(fileName, languageVersion, onError);
if (sourceFile && compilerOptions.watch) {
// Firefox has Object.prototype.watch
if (sourceFile && compilerOptions.watch && compilerOptions.hasOwnProperty("watch")) {
// 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));