From 3bd96e328a6981db9e0c3a407e5f1a602b0091cb Mon Sep 17 00:00:00 2001 From: Yui T Date: Wed, 13 May 2015 13:47:56 -0700 Subject: [PATCH 1/3] use CRLF by default --- src/harness/harness.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 9ed515eb5b60b..ade5d57433fcf 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -45,10 +45,10 @@ module Utils { export function getExecutionEnvironment() { if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") { return ExecutionEnvironment.CScript; - } else if (typeof window !== "undefined") { + } else if (typeof window !== "undefined") { return ExecutionEnvironment.Browser; - } else { - return ExecutionEnvironment.Node; + } else { + return ExecutionEnvironment.Node; } } @@ -945,6 +945,7 @@ module Harness { options = options || { noResolve: false }; options.target = options.target || ts.ScriptTarget.ES3; options.module = options.module || ts.ModuleKind.None; + options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed; options.noErrorTruncation = true; if (settingsCallback) { From 386f9f2a5d125ab9bf1c85949c114fb7c85c89bb Mon Sep 17 00:00:00 2001 From: Yui T Date: Wed, 13 May 2015 13:48:09 -0700 Subject: [PATCH 2/3] Update baseline --- tests/baselines/reference/contextualTyping1.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/baselines/reference/contextualTyping1.js b/tests/baselines/reference/contextualTyping1.js index 7f1e12c744b4e..7ceb3b582e56a 100644 --- a/tests/baselines/reference/contextualTyping1.js +++ b/tests/baselines/reference/contextualTyping1.js @@ -2,4 +2,4 @@ var foo: {id:number;} = {id:4}; //// [contextualTyping1.js] -var foo = { id: 4 };\n \ No newline at end of file +var foo = { id: 4 }; From afc0847e8bf8b174b64c699856996b0837dc9167 Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 14 May 2015 15:06:30 -0700 Subject: [PATCH 3/3] Address code review --- src/harness/harness.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index ade5d57433fcf..23cdfdfb7c525 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -45,9 +45,11 @@ module Utils { export function getExecutionEnvironment() { if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") { return ExecutionEnvironment.CScript; - } else if (typeof window !== "undefined") { + } + else if (typeof window !== "undefined") { return ExecutionEnvironment.Browser; - } else { + } + else { return ExecutionEnvironment.Node; } }