Merge branch 'update-types3' of https://github.com/ajafff/TypeScript into ajafff-update-types3

mhegazy · mhegazy · commit 1de3bbac2e8a · 2017-11-07T15:23:38.000-08:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1179,11 +1179,11 @@ namespace ts {
             return emitResult;
         }
 
-        function getSourceFile(fileName: string): SourceFile {
+        function getSourceFile(fileName: string): SourceFile | undefined {
             return getSourceFileByPath(toPath(fileName));
         }
 
-        function getSourceFileByPath(path: Path): SourceFile {
+        function getSourceFileByPath(path: Path): SourceFile | undefined {
             return filesByName.get(path);
         }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2466,8 +2466,8 @@ namespace ts {
 
     export interface ScriptReferenceHost {
         getCompilerOptions(): CompilerOptions;
-        getSourceFile(fileName: string): SourceFile;
-        getSourceFileByPath(path: Path): SourceFile;
+        getSourceFile(fileName: string): SourceFile | undefined;
+        getSourceFileByPath(path: Path): SourceFile | undefined;
         getCurrentDirectory(): string;
     }
 
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -1609,8 +1609,8 @@ declare namespace ts {
     }
     interface ScriptReferenceHost {
         getCompilerOptions(): CompilerOptions;
-        getSourceFile(fileName: string): SourceFile;
-        getSourceFileByPath(path: Path): SourceFile;
+        getSourceFile(fileName: string): SourceFile | undefined;
+        getSourceFileByPath(path: Path): SourceFile | undefined;
         getCurrentDirectory(): string;
     }
     interface ParseConfigHost {
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -1609,8 +1609,8 @@ declare namespace ts {
     }
     interface ScriptReferenceHost {
         getCompilerOptions(): CompilerOptions;
-        getSourceFile(fileName: string): SourceFile;
-        getSourceFileByPath(path: Path): SourceFile;
+        getSourceFile(fileName: string): SourceFile | undefined;
+        getSourceFileByPath(path: Path): SourceFile | undefined;
         getCurrentDirectory(): string;
     }
     interface ParseConfigHost {

Original file line number	Diff line number	Diff line change
`@@ -1179,11 +1179,11 @@ namespace ts {`
`1179`	`1179`	`return emitResult;`
`1180`	`1180`	`}`
`1181`	`1181`
`1182`		`- function getSourceFile(fileName: string): SourceFile {`
	`1182`	`+ function getSourceFile(fileName: string): SourceFile \| undefined {`
`1183`	`1183`	`return getSourceFileByPath(toPath(fileName));`
`1184`	`1184`	`}`
`1185`	`1185`
`1186`		`- function getSourceFileByPath(path: Path): SourceFile {`
	`1186`	`+ function getSourceFileByPath(path: Path): SourceFile \| undefined {`
`1187`	`1187`	`return filesByName.get(path);`
`1188`	`1188`	`}`
`1189`	`1189`
Original file line number	Diff line number	Diff line change
`@@ -2466,8 +2466,8 @@ namespace ts {`
`2466`	`2466`
`2467`	`2467`	`export interface ScriptReferenceHost {`
`2468`	`2468`	`getCompilerOptions(): CompilerOptions;`
`2469`		`- getSourceFile(fileName: string): SourceFile;`
`2470`		`- getSourceFileByPath(path: Path): SourceFile;`
	`2469`	`+ getSourceFile(fileName: string): SourceFile \| undefined;`
	`2470`	`+ getSourceFileByPath(path: Path): SourceFile \| undefined;`
`2471`	`2471`	`getCurrentDirectory(): string;`
`2472`	`2472`	`}`
`2473`	`2473`
Original file line number	Diff line number	Diff line change
`@@ -1609,8 +1609,8 @@ declare namespace ts {`
`1609`	`1609`	`}`
`1610`	`1610`	`interface ScriptReferenceHost {`
`1611`	`1611`	`getCompilerOptions(): CompilerOptions;`
`1612`		`- getSourceFile(fileName: string): SourceFile;`
`1613`		`- getSourceFileByPath(path: Path): SourceFile;`
	`1612`	`+ getSourceFile(fileName: string): SourceFile \| undefined;`
	`1613`	`+ getSourceFileByPath(path: Path): SourceFile \| undefined;`
`1614`	`1614`	`getCurrentDirectory(): string;`
`1615`	`1615`	`}`
`1616`	`1616`	`interface ParseConfigHost {`