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

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit ade92873bc11 · 2016-03-30T10:24:11.000-07:00
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -827,8 +827,8 @@ namespace Harness {
             return libFileNameSourceFileMap[fileName];
         }
 
-        export function getDefaultLibSourceFile(languageVersion: ts.ScriptTarget) {
-            return languageVersion === ts.ScriptTarget.ES6 ? getDefaultLibrarySourceFile(es2015DefaultLibFileName) : getDefaultLibrarySourceFile(defaultLibFileName);
+        export function getDefaultLibFileName(options: ts.CompilerOptions): string {
+            return options.target === ts.ScriptTarget.ES6 ? es2015DefaultLibFileName : defaultLibFileName
         }
 
         // Cache these between executions so we don't have to re-parse them for every test
@@ -887,7 +887,7 @@ namespace Harness {
             return {
                 getCurrentDirectory: () => currentDirectory,
                 getSourceFile,
-                getDefaultLibFileName: options => options.target === ts.ScriptTarget.ES6 ? es2015DefaultLibFileName : defaultLibFileName,
+                getDefaultLibFileName,
                 writeFile,
                 getCanonicalFileName,
                 useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
@@ -156,7 +156,7 @@ class ProjectRunner extends RunnerBase {
             function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile {
                 let sourceFile: ts.SourceFile = undefined;
                 if (fileName === Harness.Compiler.defaultLibFileName) {
-                    sourceFile = Harness.Compiler.getDefaultLibSourceFile(languageVersion);
+                    sourceFile = Harness.Compiler.getDefaultLibrarySourceFile(Harness.Compiler.getDefaultLibFileName(compilerOptions));
                 }
                 else {
                     const text = getSourceFileText(fileName);

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ class ProjectRunner extends RunnerBase {`
`156`	`156`	`function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile {`
`157`	`157`	`let sourceFile: ts.SourceFile = undefined;`
`158`	`158`	`if (fileName === Harness.Compiler.defaultLibFileName) {`
`159`		`- sourceFile = Harness.Compiler.getDefaultLibSourceFile(languageVersion);`
	`159`	`+ sourceFile = Harness.Compiler.getDefaultLibrarySourceFile(Harness.Compiler.getDefaultLibFileName(compilerOptions));`
`160`	`160`	`}`
`161`	`161`	`else {`
`162`	`162`	`const text = getSourceFileText(fileName);`