Merge pull request microsoft#20374 from uniqueiniquity/symlinkTypeReferenceDirective

uniqueiniquity · web-flow · commit d2d0f868319e · 2018-03-29T15:26:30.000-07:00
Handle failure to properly resolve type reference directives
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -25929,7 +25929,7 @@ namespace ts {
                 // populate reverse mapping: file path -> type reference directive that was resolved to this file
                 fileToDirective = createMap<string>();
                 resolvedTypeReferenceDirectives.forEach((resolvedDirective, key) => {
-                    if (!resolvedDirective) {
+                    if (!resolvedDirective || !resolvedDirective.resolvedFileName) {
                         return;
                     }
                     const file = host.getSourceFile(resolvedDirective.resolvedFileName);
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -794,6 +794,7 @@ namespace ts {
         if (traceEnabled) {
             trace(host, Diagnostics.Resolving_real_path_for_0_result_1, path, real);
         }
+        Debug.assert(host.fileExists(real), `${path} linked to nonexistent file ${real}`); // tslint:disable-line
         return real;
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2779,7 +2779,7 @@ namespace ts {
         getCompilerOptions(): CompilerOptions;
 
         getSourceFiles(): ReadonlyArray<SourceFile>;
-        getSourceFile(fileName: string): SourceFile;
+        getSourceFile(fileName: string): SourceFile | undefined;
         getResolvedTypeReferenceDirectives(): ReadonlyMap<ResolvedTypeReferenceDirective>;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -25929,7 +25929,7 @@ namespace ts {`
`25929`	`25929`	`// populate reverse mapping: file path -> type reference directive that was resolved to this file`
`25930`	`25930`	`fileToDirective = createMap<string>();`
`25931`	`25931`	`resolvedTypeReferenceDirectives.forEach((resolvedDirective, key) => {`
`25932`		`- if (!resolvedDirective) {`
	`25932`	`+ if (!resolvedDirective \|\| !resolvedDirective.resolvedFileName) {`
`25933`	`25933`	`return;`
`25934`	`25934`	`}`
`25935`	`25935`	`const file = host.getSourceFile(resolvedDirective.resolvedFileName);`
Original file line number	Diff line number	Diff line change
`@@ -794,6 +794,7 @@ namespace ts {`
`794`	`794`	`if (traceEnabled) {`
`795`	`795`	`trace(host, Diagnostics.Resolving_real_path_for_0_result_1, path, real);`
`796`	`796`	`}`
	`797`	+ Debug.assert(host.fileExists(real), `${path} linked to nonexistent file ${real}`); // tslint:disable-line
`797`	`798`	`return real;`
`798`	`799`	`}`
`799`	`800`
Original file line number	Diff line number	Diff line change
`@@ -2779,7 +2779,7 @@ namespace ts {`
`2779`	`2779`	`getCompilerOptions(): CompilerOptions;`
`2780`	`2780`
`2781`	`2781`	`getSourceFiles(): ReadonlyArray<SourceFile>;`
`2782`		`- getSourceFile(fileName: string): SourceFile;`
	`2782`	`+ getSourceFile(fileName: string): SourceFile \| undefined;`
`2783`	`2783`	`getResolvedTypeReferenceDirectives(): ReadonlyMap<ResolvedTypeReferenceDirective>;`
`2784`	`2784`	`}`
`2785`	`2785`