Skip to content

Commit 631def8

Browse files
Merge pull request microsoft#37260 from uniqueiniquity/watchFileExistsFix
Fix fileExists check for a watch program
2 parents 931e33f + a4430f7 commit 631def8

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

src/compiler/watchPublic.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ namespace ts {
450450
// If file is missing on host from cache, we can definitely say file doesnt exist
451451
// otherwise we need to ensure from the disk
452452
if (isFileMissingOnHost(sourceFilesCache.get(path))) {
453-
return true;
453+
return false;
454454
}
455455

456456
return directoryStructureHost.fileExists(fileName);

src/testRunner/unittests/tscWatch/programUpdates.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ export class A {
401401
verifyTscWatch({
402402
scenario,
403403
subScenario: "deleted files affect project structure",
404-
commandLineArgs: ["-w", "/a/b/f1.ts"],
404+
commandLineArgs: ["-w", "/a/b/f1.ts", "--noImplicitAny"],
405405
sys: () => {
406406
const file1 = {
407407
path: "/a/b/f1.ts",
@@ -429,7 +429,7 @@ export class A {
429429
verifyTscWatch({
430430
scenario,
431431
subScenario: "deleted files affect project structure-2",
432-
commandLineArgs: ["-w", "/a/b/f1.ts", "/a/c/f3.ts"],
432+
commandLineArgs: ["-w", "/a/b/f1.ts", "/a/c/f3.ts", "--noImplicitAny"],
433433
sys: () => {
434434
const file1 = {
435435
path: "/a/b/f1.ts",

tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/a/lib/tsc.js -w /a/b/f1.ts /a/c/f3.ts
1+
/a/lib/tsc.js -w /a/b/f1.ts /a/c/f3.ts --noImplicitAny
22
//// [/a/b/f1.ts]
33
export * from "./f2"
44

@@ -71,7 +71,7 @@ Output::
7171

7272

7373
Program root files: ["/a/b/f1.ts","/a/c/f3.ts"]
74-
Program options: {"watch":true}
74+
Program options: {"watch":true,"noImplicitAny":true}
7575
Program files::
7676
/a/lib/lib.d.ts
7777
/a/c/f3.ts
@@ -110,14 +110,14 @@ Output::
110110
12:00:28 AM - File change detected. Starting incremental compilation...
111111

112112

113-
a/b/f1.ts(1,15): error TS2307: Cannot find module './f2'.
113+
a/b/f1.ts(1,15): error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
114114

115115

116116
12:00:32 AM - Found 1 error. Watching for file changes.
117117

118118

119119
Program root files: ["/a/b/f1.ts","/a/c/f3.ts"]
120-
Program options: {"watch":true}
120+
Program options: {"watch":true,"noImplicitAny":true}
121121
Program files::
122122
/a/lib/lib.d.ts
123123
/a/b/f1.ts
@@ -133,11 +133,11 @@ WatchedFiles::
133133
{"fileName":"/a/c/f3.ts","pollingInterval":250}
134134
/a/lib/lib.d.ts:
135135
{"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
136-
/a/b/f2.ts:
137-
{"fileName":"/a/b/f2.ts","pollingInterval":250}
138136

139137
FsWatches::
140138

141139
FsWatchesRecursive::
140+
/a:
141+
{"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
142142

143143
exitCode:: ExitStatus.undefined

tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/a/lib/tsc.js -w /a/b/f1.ts
1+
/a/lib/tsc.js -w /a/b/f1.ts --noImplicitAny
22
//// [/a/b/f1.ts]
33
export * from "./f2"
44

@@ -71,7 +71,7 @@ Output::
7171

7272

7373
Program root files: ["/a/b/f1.ts"]
74-
Program options: {"watch":true}
74+
Program options: {"watch":true,"noImplicitAny":true}
7575
Program files::
7676
/a/lib/lib.d.ts
7777
/a/c/f3.ts
@@ -110,14 +110,14 @@ Output::
110110
12:00:28 AM - File change detected. Starting incremental compilation...
111111

112112

113-
a/b/f1.ts(1,15): error TS2307: Cannot find module './f2'.
113+
a/b/f1.ts(1,15): error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
114114

115115

116116
12:00:32 AM - Found 1 error. Watching for file changes.
117117

118118

119119
Program root files: ["/a/b/f1.ts"]
120-
Program options: {"watch":true}
120+
Program options: {"watch":true,"noImplicitAny":true}
121121
Program files::
122122
/a/lib/lib.d.ts
123123
/a/b/f1.ts
@@ -130,11 +130,11 @@ WatchedFiles::
130130
{"fileName":"/a/b/f1.ts","pollingInterval":250}
131131
/a/lib/lib.d.ts:
132132
{"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
133-
/a/b/f2.ts:
134-
{"fileName":"/a/b/f2.ts","pollingInterval":250}
135133

136134
FsWatches::
137135

138136
FsWatchesRecursive::
137+
/a:
138+
{"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
139139

140140
exitCode:: ExitStatus.undefined

tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ WatchedFiles::
104104
{"fileName":"/a/b/file1.ts","pollingInterval":250}
105105
/a/lib/lib.d.ts:
106106
{"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
107-
/a/b/modulefile.ts:
108-
{"fileName":"/a/b/modulefile.ts","pollingInterval":250}
109107

110108
FsWatches::
111109

112110
FsWatchesRecursive::
111+
/a:
112+
{"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
113113

114114
exitCode:: ExitStatus.undefined
115115

0 commit comments

Comments
 (0)