Fixed watcher for rename operations, and for allowJs in config file

billti · billti · commit cc76f0f7f034 · 2016-02-12T08:59:16.000-08:00
(cherry picked from commit 745f32b)
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -378,7 +378,8 @@ namespace ts {
                     const filePath = typeof relativeFileName !== "string"
                         ? undefined
                         : toPath(relativeFileName, baseDirPath, createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
-                    if (eventName === "change" && fileWatcherCallbacks.contains(filePath)) {
+                    // Some applications save a working file via rename operations
+                    if ((eventName === "change" || eventName === "rename") && fileWatcherCallbacks.contains(filePath)) {
                         for (const fileCallback of fileWatcherCallbacks.get(filePath)) {
                             fileCallback(filePath);
                         }
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -486,7 +486,7 @@ namespace ts {
         }
 
         function watchedDirectoryChanged(fileName: string) {
-            if (fileName && !ts.isSupportedSourceFileName(fileName, commandLine.options)) {
+            if (fileName && !ts.isSupportedSourceFileName(fileName, compilerOptions)) {
                 return;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ namespace ts {`
`486`	`486`	`}`
`487`	`487`
`488`	`488`	`function watchedDirectoryChanged(fileName: string) {`
`489`		`- if (fileName && !ts.isSupportedSourceFileName(fileName, commandLine.options)) {`
	`489`	`+ if (fileName && !ts.isSupportedSourceFileName(fileName, compilerOptions)) {`
`490`	`490`	`return;`
`491`	`491`	`}`
`492`	`492`