Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into configuration-inheritance

Browse Source 
# Conflicts:
#	src/compiler/core.ts
This commit is contained in:
Mohamed Hegazy
2016-08-29 16:00:21 -07:00
parent 167d318a13 0485bb6b56
commit 19f62a41de
467 changed files with 13322 additions and 2933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/harness/virtualFileSystem.ts
+2 -2
View File
@@ -159,9 +159,9 @@ namespace Utils {
}
export class MockParseConfigHost extends VirtualFileSystem implements ts.ParseConfigHost {
constructor(currentDirectory: string, ignoreCase: boolean, files: ts.Map<string> | string[]) {
constructor(currentDirectory: string, ignoreCase: boolean, files: ts.MapLike<string> | string[]) {
super(currentDirectory, ignoreCase);
const fileNames = (files instanceof Array) ? files : ts.getKeys(files);
const fileNames = (files instanceof Array) ? files : ts.getOwnKeys(files);
for (const file of fileNames) {
this.addFile(file, (files as any)[file]);
}