microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-23 10:04:47 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #3155 from Microsoft/useCRLFByDefaultInTest

Browse Source 
Use crlf by default in test
This commit is contained in:
Yui
2015-05-14 15:59:24 -07:00
parent ce98da3b27 af3d67dd92
commit 4b92e25b76
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/harness/harness.ts
View File

@@ -45,10 +45,12 @@ 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 +947,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) {

2
tests/baselines/reference/contextualTyping1.js
View File

@@ -2,4 +2,4 @@
var foo: {id:number;} = {id:4};
//// [contextualTyping1.js]
var foo = { id: 4 };\n
var foo = { id: 4 };