maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Address PR: merge two functions to get-default-library-file

Browse source
This commit is contained in:
Kanchalai Tanglertsampan 2016-03-30 10:24:11 -07:00
parent 41a95b7535
commit ade92873bc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/harness/harness.ts
View file

@ -827,8 +827,8 @@ namespace Harness {
return libFileNameSourceFileMap[fileName]; return libFileNameSourceFileMap[fileName];
} }
export function getDefaultLibSourceFile(languageVersion: ts.ScriptTarget) { export function getDefaultLibFileName(options: ts.CompilerOptions): string {
return languageVersion === ts.ScriptTarget.ES6 ? getDefaultLibrarySourceFile(es2015DefaultLibFileName) : getDefaultLibrarySourceFile(defaultLibFileName); return options.target === ts.ScriptTarget.ES6 ? es2015DefaultLibFileName : defaultLibFileName
} }
// Cache these between executions so we don't have to re-parse them for every test // Cache these between executions so we don't have to re-parse them for every test
@ -887,7 +887,7 @@ namespace Harness {
return { return {
getCurrentDirectory: () => currentDirectory, getCurrentDirectory: () => currentDirectory,
getSourceFile, getSourceFile,
getDefaultLibFileName: options => options.target === ts.ScriptTarget.ES6 ? es2015DefaultLibFileName : defaultLibFileName, getDefaultLibFileName,
writeFile, writeFile,
getCanonicalFileName, getCanonicalFileName,
useCaseSensitiveFileNames: () => useCaseSensitiveFileNames, useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,

2
src/harness/projectsRunner.ts
View file

@ -156,7 +156,7 @@ class ProjectRunner extends RunnerBase {
function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile { function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile {
let sourceFile: ts.SourceFile = undefined; let sourceFile: ts.SourceFile = undefined;
if (fileName === Harness.Compiler.defaultLibFileName) { if (fileName === Harness.Compiler.defaultLibFileName) {
sourceFile = Harness.Compiler.getDefaultLibSourceFile(languageVersion); sourceFile = Harness.Compiler.getDefaultLibrarySourceFile(Harness.Compiler.getDefaultLibFileName(compilerOptions));
} }
else { else {
const text = getSourceFileText(fileName); const text = getSourceFileText(fileName);