From 55d7edf89f3b32cdaf400709b3a47c7407d964d6 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Fri, 21 Aug 2015 15:50:31 -0700
Subject: [PATCH] Rename setCompilerOptionsFromSetting to
 setCompilerOptionsFromHarnessSetting

---
 src/harness/fourslash.ts | 2 +-
 src/harness/harness.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index c2961f60ab6..ae131b8390f 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -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;
     }
 
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 741a9e700a0..1e4d1174d90 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -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.