Rename setCompilerOptionsFromSetting to setCompilerOptionsFromHarnessSetting

This commit is contained in:
Mohamed Hegazy
2015-08-21 15:50:31 -07:00
parent a8482358cc
commit 55d7edf89f
2 changed files with 3 additions and 3 deletions

View File

@@ -127,7 +127,7 @@ module FourSlash {
function convertGlobalOptionsToCompilerOptions(globalOptions: { [idx: string]: string }): ts.CompilerOptions {
let settings: ts.CompilerOptions = { target: ts.ScriptTarget.ES5 };
Harness.Compiler.setCompilerOptionForSetting(globalOptions, settings);
Harness.Compiler.setCompilerOptionsFromHarnessSetting(globalOptions, settings);
return settings;
}

View File

@@ -942,7 +942,7 @@ module Harness {
baselineFile?: string;
}
export function setCompilerOptionForSetting(settings: Harness.TestCaseParser.CompilerSettings, options: ts.CompilerOptions & HarnesOptions): void {
export function setCompilerOptionsFromHarnessSetting(settings: Harness.TestCaseParser.CompilerSettings, options: ts.CompilerOptions & HarnesOptions): void {
for (let name in settings) {
if (settings.hasOwnProperty(name)) {
let value = settings[name] ? settings[name].toLowerCase() : settings[name];
@@ -1203,7 +1203,7 @@ module Harness {
options.skipDefaultLibCheck = true;
// Parse settings
setCompilerOptionForSetting(this.settings, options);
setCompilerOptionsFromHarnessSetting(this.settings, options);
// Files from built\local that are requested by test "@includeBuiltFiles" to be in the context.
// Treat them as library files, so include them in build, but not in baselines.