microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-20 13:45:34 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

removed unused type assertions in harness

Browse Source
This commit is contained in:
Vladimir Matveev
2016-04-01 21:26:39 -07:00
parent 12d90f3be9
commit a4f30ff2a7
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/program.ts
View File

@@ -12,7 +12,7 @@ namespace ts {
const emptyArray: any[] = [];
const defaultLibrarySearchPaths = <Path[]>[
const defaultLibrarySearchPaths = [
"types/",
"node_modules/",
"node_modules/@types/",

9
src/harness/harness.ts
View File

@@ -856,8 +856,6 @@ namespace Harness {
// Local get canonical file name function, that depends on passed in parameter for useCaseSensitiveFileNames
const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
const harnessNormalizePath = (f: string) => <ts.Path>ts.normalizePath(getCanonicalFileName(f));
const fileMap: ts.FileMap<ts.SourceFile> = ts.createFileMap<ts.SourceFile>();
for (const file of inputFiles) {
if (file.content !== undefined) {
@@ -865,7 +863,6 @@ namespace Harness {
const sourceFile = createSourceFileAndAssertInvariants(fileName, file.content, scriptTarget);
const path = ts.toPath(file.unitName, currentDirectory, getCanonicalFileName);
fileMap.set(path, sourceFile);
fileMap.set(harnessNormalizePath(path), sourceFile);
}
}
@@ -902,10 +899,10 @@ namespace Harness {
useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
getNewLine: () => newLine,
fileExists: fileName => {
return fileMap.contains(harnessNormalizePath(fileName));
return fileMap.contains(ts.toPath(fileName, currentDirectory, getCanonicalFileName));
},
readFile: (fileName: string): string => {
return fileMap.get(harnessNormalizePath(fileName)).getText();
return fileMap.get(ts.toPath(fileName, currentDirectory, getCanonicalFileName)).getText();
}
};
}
@@ -1493,7 +1490,7 @@ namespace Harness {
baseDir = ts.getNormalizedAbsolutePath(baseDir, rootDir);
}
tsConfig = ts.parseJsonConfigFileContent(configJson.config, parseConfigHost, baseDir);
tsConfig.options.configFilePath = <ts.Path>data.name;
tsConfig.options.configFilePath = data.name;
// delete entry from the list
testUnitData.splice(i, 1);