Add test case for file change happening as part of file create and delete

sheetalkamat · sheetalkamat · commit 384aad6906d0 · 2018-02-06T10:50:32.000-08:00
diff --git a/src/harness/unittests/tscWatchMode.ts b/src/harness/unittests/tscWatchMode.ts
@@ -1719,6 +1719,38 @@ namespace ts.tscWatch {
                 return [files[0]];
             }
         });
+
+        it("file is deleted and created as part of change", () => {
+            const projectLocation = "/home/username/project";
+            const file: FileOrFolder = {
+                path: `${projectLocation}/app/file.ts`,
+                content: "var a = 10;"
+            };
+            const fileJs = `${projectLocation}/app/file.js`;
+            const configFile: FileOrFolder = {
+                path: `${projectLocation}/tsconfig.json`,
+                content: JSON.stringify({
+                    "include": [
+                        "app/**/*.ts"
+                    ]
+                })
+            };
+            const files = [file, configFile, libFile];
+            const host = createWatchedSystem(files, { currentDirectory: projectLocation, useCaseSensitiveFileNames: true });
+            createWatchOfConfigFile("tsconfig.json", host);
+            verifyProgram();
+
+            file.content += "var b = 10;";
+
+            host.reloadFS(files, { invokeFileDeleteCreateAsPartInsteadOfChange: true });
+            host.runQueuedTimeoutCallbacks();
+            verifyProgram();
+
+            function verifyProgram() {
+                assert.isTrue(host.fileExists(fileJs));
+                assert.equal(host.readFile(fileJs), file.content + "\n");
+            }
+        });
     });
 
     describe("tsc-watch module resolution caching", () => {
diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
@@ -246,8 +246,12 @@ interface Array<T> {}`
     }
 
     export interface ReloadWatchInvokeOptions {
+        /** Invokes the directory watcher for the parent instead of the file changed */
         invokeDirectoryWatcherInsteadOfFileChanged: boolean;
+        /** When new file is created, do not invoke watches for it */
         ignoreWatchInvokedWithTriggerAsFileCreate: boolean;
+        /** Invoke the file delete, followed by create instead of file changed */
+        invokeFileDeleteCreateAsPartInsteadOfChange: boolean;
     }
 
     export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost, ModuleResolutionHost {
@@ -315,12 +319,18 @@ interface Array<T> {}`
                         if (isString(fileOrDirectory.content)) {
                             // Update file
                             if (currentEntry.content !== fileOrDirectory.content) {
-                                currentEntry.content = fileOrDirectory.content;
-                                if (options && options.invokeDirectoryWatcherInsteadOfFileChanged) {
-                                    this.invokeDirectoryWatcher(getDirectoryPath(currentEntry.fullPath), currentEntry.fullPath);
+                                if (options && options.invokeFileDeleteCreateAsPartInsteadOfChange) {
+                                    this.removeFileOrFolder(currentEntry, returnFalse);
+                                    this.ensureFileOrFolder(fileOrDirectory);
                                 }
                                 else {
-                                    this.invokeFileWatcher(currentEntry.fullPath, FileWatcherEventKind.Changed);
+                                    currentEntry.content = fileOrDirectory.content;
+                                    if (options && options.invokeDirectoryWatcherInsteadOfFileChanged) {
+                                        this.invokeDirectoryWatcher(getDirectoryPath(currentEntry.fullPath), currentEntry.fullPath);
+                                    }
+                                    else {
+                                        this.invokeFileWatcher(currentEntry.fullPath, FileWatcherEventKind.Changed);
+                                    }
                                 }
                             }
                         }

Original file line number	Diff line number	Diff line change
@@ -246,8 +246,12 @@ interface Array<T> {}`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`export interface ReloadWatchInvokeOptions {`
	`249`	`+ /** Invokes the directory watcher for the parent instead of the file changed */`
`249`	`250`	`invokeDirectoryWatcherInsteadOfFileChanged: boolean;`
	`251`	`+ /** When new file is created, do not invoke watches for it */`
`250`	`252`	`ignoreWatchInvokedWithTriggerAsFileCreate: boolean;`
	`253`	`+ /** Invoke the file delete, followed by create instead of file changed */`
	`254`	`+ invokeFileDeleteCreateAsPartInsteadOfChange: boolean;`
`251`	`255`	`}`
`252`	`256`
`253`	`257`	`export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost, ModuleResolutionHost {`
@@ -315,12 +319,18 @@ interface Array<T> {}`
`315`	`319`	`if (isString(fileOrDirectory.content)) {`
`316`	`320`	`// Update file`
`317`	`321`	`if (currentEntry.content !== fileOrDirectory.content) {`
`318`		`- currentEntry.content = fileOrDirectory.content;`
`319`		`- if (options && options.invokeDirectoryWatcherInsteadOfFileChanged) {`
`320`		`- this.invokeDirectoryWatcher(getDirectoryPath(currentEntry.fullPath), currentEntry.fullPath);`
	`322`	`+ if (options && options.invokeFileDeleteCreateAsPartInsteadOfChange) {`
	`323`	`+ this.removeFileOrFolder(currentEntry, returnFalse);`
	`324`	`+ this.ensureFileOrFolder(fileOrDirectory);`
`321`	`325`	`}`
`322`	`326`	`else {`
`323`		`- this.invokeFileWatcher(currentEntry.fullPath, FileWatcherEventKind.Changed);`
	`327`	`+ currentEntry.content = fileOrDirectory.content;`
	`328`	`+ if (options && options.invokeDirectoryWatcherInsteadOfFileChanged) {`
	`329`	`+ this.invokeDirectoryWatcher(getDirectoryPath(currentEntry.fullPath), currentEntry.fullPath);`
	`330`	`+ }`
	`331`	`+ else {`
	`332`	`+ this.invokeFileWatcher(currentEntry.fullPath, FileWatcherEventKind.Changed);`
	`333`	`+ }`
`324`	`334`	`}`
`325`	`335`	`}`
`326`	`336`	`}`