Update tests baselines

a-tarasyuk · a-tarasyuk · commit 37add88b1878 · 2018-07-20T10:17:27.000+03:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -63,7 +63,7 @@ namespace ts {
     interface OutputFingerprint {
         hash: string;
         byteOrderMark: boolean;
-        mtime: Date | undefined;
+        mtime: Date;
     }
 
     export function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost {
@@ -128,15 +128,14 @@ namespace ts {
                 if (fingerprint &&
                     fingerprint.byteOrderMark === writeByteOrderMark &&
                     fingerprint.hash === hash &&
-                    fingerprint.mtime !== undefined &&
                     fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
                     return;
                 }
             }
 
             sys.writeFile(fileName, data, writeByteOrderMark);
 
-            const mtimeAfter = sys.getModifiedTime!(fileName); // TODO: GH#18217
+            const mtimeAfter = sys.getModifiedTime!(fileName) || missingFileModifiedTime; // TODO: GH#18217
 
             outputFingerprints.set(fileName, {
                 hash,
diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts
@@ -843,12 +843,14 @@ namespace ts {
                 return buildHost.message(Diagnostics.A_non_dry_build_would_build_project_0, proj.options.configFilePath!);
             }
 
-            if (context.options.verbose) buildHost.verbose(Diagnostics.Updating_output_timestamps_of_project_0, proj.options.configFilePath!);
+            if (context.options.verbose) {
+                buildHost.verbose(Diagnostics.Updating_output_timestamps_of_project_0, proj.options.configFilePath!);
+            }
+
             const now = new Date();
             const outputs = getAllProjectOutputs(proj);
             let priorNewestUpdateTime = minimumDate;
             for (const file of outputs) {
-
                 if (isDeclarationFile(file)) {
                     const fileModifiedTime = compilerHost.getModifiedTime!(file);
                     if (fileModifiedTime !== undefined) {
@@ -1062,8 +1064,8 @@ namespace ts {
                 };
             }
 
-            const inputTime = host.getModifiedTime(inputFile);
-            if (inputTime !== undefined && inputTime > newestInputFileTime) {
+            const inputTime = host.getModifiedTime(inputFile) || missingFileModifiedTime;
+            if (inputTime > newestInputFileTime) {
                 newestInputFileName = inputFile;
                 newestInputFileTime = inputTime;
             }
@@ -1094,20 +1096,20 @@ namespace ts {
                 break;
             }
 
-            const outputTime = host.getModifiedTime(output);
-            if (outputTime !== undefined && outputTime < oldestOutputFileTime) {
+            const outputTime = host.getModifiedTime(output) || missingFileModifiedTime;
+            if (outputTime < oldestOutputFileTime) {
                 oldestOutputFileTime = outputTime;
                 oldestOutputFileName = output;
             }
 
             // If an output is older than the newest input, we can stop checking
             // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-            if (outputTime !== undefined && outputTime < newestInputFileTime) {
+            if (outputTime < newestInputFileTime) {
                 isOutOfDateWithInputs = true;
                 break;
             }
 
-            if (outputTime !== undefined && outputTime > newestOutputFileTime) {
+            if (outputTime > newestOutputFileTime) {
                 newestOutputFileTime = outputTime;
                 newestOutputFileName = output;
             }
@@ -1122,10 +1124,8 @@ namespace ts {
                     newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
                 }
                 else {
-                    const outputModifiedTime = host.getModifiedTime(output);
-                    if (outputModifiedTime !== undefined) {
-                        newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
-                    }
+                    const outputModifiedTime = host.getModifiedTime(output) || missingFileModifiedTime;
+                    newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
                 }
             }
         }
diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts
@@ -676,7 +676,7 @@ namespace ts.server {
             fs.stat(watchedFile.fileName, (err, stats) => {
                 if (err) {
                     if (err.code === "ENOENT") {
-                        if (watchedFile.mtime !== undefined && watchedFile.mtime.getTime() !== 0) {
+                        if (watchedFile.mtime.getTime() !== 0) {
                             watchedFile.mtime = missingFileModifiedTime;
                             watchedFile.callback(watchedFile.fileName, FileWatcherEventKind.Deleted);
                         }
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2581,7 +2581,7 @@ declare namespace ts {
     }
     interface UpToDateHost {
         fileExists(fileName: string): boolean;
-        getModifiedTime(fileName: string): Date;
+        getModifiedTime(fileName: string): Date | undefined;
         getUnchangedTime?(fileName: string): Date | undefined;
         getLastStatus?(fileName: string): UpToDateStatus | undefined;
         setLastStatus?(fileName: string, status: UpToDateStatus): void;
@@ -2685,7 +2685,7 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
-        getModifiedTime?(fileName: string): Date;
+        getModifiedTime?(fileName: string): Date | undefined;
         setModifiedTime?(fileName: string, date: Date): void;
         deleteFile?(fileName: string): void;
     }
@@ -3022,7 +3022,7 @@ declare namespace ts {
         getCurrentDirectory(): string;
         getDirectories(path: string): string[];
         readDirectory(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
-        getModifiedTime?(path: string): Date;
+        getModifiedTime?(path: string): Date | undefined;
         setModifiedTime?(path: string, time: Date): void;
         deleteFile?(path: string): void;
         /**
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -2581,7 +2581,7 @@ declare namespace ts {
     }
     interface UpToDateHost {
         fileExists(fileName: string): boolean;
-        getModifiedTime(fileName: string): Date;
+        getModifiedTime(fileName: string): Date | undefined;
         getUnchangedTime?(fileName: string): Date | undefined;
         getLastStatus?(fileName: string): UpToDateStatus | undefined;
         setLastStatus?(fileName: string, status: UpToDateStatus): void;
@@ -2685,7 +2685,7 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
-        getModifiedTime?(fileName: string): Date;
+        getModifiedTime?(fileName: string): Date | undefined;
         setModifiedTime?(fileName: string, date: Date): void;
         deleteFile?(fileName: string): void;
     }
@@ -3022,7 +3022,7 @@ declare namespace ts {
         getCurrentDirectory(): string;
         getDirectories(path: string): string[];
         readDirectory(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
-        getModifiedTime?(path: string): Date;
+        getModifiedTime?(path: string): Date | undefined;
         setModifiedTime?(path: string, time: Date): void;
         deleteFile?(path: string): void;
         /**

Original file line number	Diff line number	Diff line change
`@@ -843,12 +843,14 @@ namespace ts {`
`843`	`843`	`return buildHost.message(Diagnostics.A_non_dry_build_would_build_project_0, proj.options.configFilePath!);`
`844`	`844`	`}`
`845`	`845`
`846`		`- if (context.options.verbose) buildHost.verbose(Diagnostics.Updating_output_timestamps_of_project_0, proj.options.configFilePath!);`
	`846`	`+ if (context.options.verbose) {`
	`847`	`+ buildHost.verbose(Diagnostics.Updating_output_timestamps_of_project_0, proj.options.configFilePath!);`
	`848`	`+ }`
	`849`	`+`
`847`	`850`	`const now = new Date();`
`848`	`851`	`const outputs = getAllProjectOutputs(proj);`
`849`	`852`	`let priorNewestUpdateTime = minimumDate;`
`850`	`853`	`for (const file of outputs) {`
`851`		`-`
`852`	`854`	`if (isDeclarationFile(file)) {`
`853`	`855`	`const fileModifiedTime = compilerHost.getModifiedTime!(file);`
`854`	`856`	`if (fileModifiedTime !== undefined) {`
`@@ -1062,8 +1064,8 @@ namespace ts {`
`1062`	`1064`	`};`
`1063`	`1065`	`}`
`1064`	`1066`
`1065`		`- const inputTime = host.getModifiedTime(inputFile);`
`1066`		`- if (inputTime !== undefined && inputTime > newestInputFileTime) {`
	`1067`	`+ const inputTime = host.getModifiedTime(inputFile) \|\| missingFileModifiedTime;`
	`1068`	`+ if (inputTime > newestInputFileTime) {`
`1067`	`1069`	`newestInputFileName = inputFile;`
`1068`	`1070`	`newestInputFileTime = inputTime;`
`1069`	`1071`	`}`
`@@ -1094,20 +1096,20 @@ namespace ts {`
`1094`	`1096`	`break;`
`1095`	`1097`	`}`
`1096`	`1098`
`1097`		`- const outputTime = host.getModifiedTime(output);`
`1098`		`- if (outputTime !== undefined && outputTime < oldestOutputFileTime) {`
	`1099`	`+ const outputTime = host.getModifiedTime(output) \|\| missingFileModifiedTime;`
	`1100`	`+ if (outputTime < oldestOutputFileTime) {`
`1099`	`1101`	`oldestOutputFileTime = outputTime;`
`1100`	`1102`	`oldestOutputFileName = output;`
`1101`	`1103`	`}`
`1102`	`1104`
`1103`	`1105`	`// If an output is older than the newest input, we can stop checking`
`1104`	`1106`	`// Don't immediately return because we can still be upstream-blocked, which is a higher-priority status`
`1105`		`- if (outputTime !== undefined && outputTime < newestInputFileTime) {`
	`1107`	`+ if (outputTime < newestInputFileTime) {`
`1106`	`1108`	`isOutOfDateWithInputs = true;`
`1107`	`1109`	`break;`
`1108`	`1110`	`}`
`1109`	`1111`
`1110`		`- if (outputTime !== undefined && outputTime > newestOutputFileTime) {`
	`1112`	`+ if (outputTime > newestOutputFileTime) {`
`1111`	`1113`	`newestOutputFileTime = outputTime;`
`1112`	`1114`	`newestOutputFileName = output;`
`1113`	`1115`	`}`
`@@ -1122,10 +1124,8 @@ namespace ts {`
`1122`	`1124`	`newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);`
`1123`	`1125`	`}`
`1124`	`1126`	`else {`
`1125`		`- const outputModifiedTime = host.getModifiedTime(output);`
`1126`		`- if (outputModifiedTime !== undefined) {`
`1127`		`- newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);`
`1128`		`- }`
	`1127`	`+ const outputModifiedTime = host.getModifiedTime(output) \|\| missingFileModifiedTime;`
	`1128`	`+ newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);`
`1129`	`1129`	`}`
`1130`	`1130`	`}`
`1131`	`1131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -676,7 +676,7 @@ namespace ts.server {`
`676`	`676`	`fs.stat(watchedFile.fileName, (err, stats) => {`
`677`	`677`	`if (err) {`
`678`	`678`	`if (err.code === "ENOENT") {`
`679`		`- if (watchedFile.mtime !== undefined && watchedFile.mtime.getTime() !== 0) {`
	`679`	`+ if (watchedFile.mtime.getTime() !== 0) {`
`680`	`680`	`watchedFile.mtime = missingFileModifiedTime;`
`681`	`681`	`watchedFile.callback(watchedFile.fileName, FileWatcherEventKind.Deleted);`
`682`	`682`	`}`