Merge branch 'release-1.4' into fixProcessDiagMessagesProbWith1.4Merge

Conflicts:
	tests/baselines/reference/APISample_node_compile.js
	tests/baselines/reference/APISample_node_compile.types
	tests/baselines/reference/APISample_standalone_compile.js
	tests/baselines/reference/APISample_standalone_compile.types
	tests/cases/compiler/APISample_node_compile.ts
	tests/cases/compiler/APISample_standalone_compile.ts
This commit is contained in:
Daniel Rosenwasser authored and Daniel Rosenwasser committed 2014-12-12 00:09:23 -08:00
commit 854586e824
7 files changed
+1 -15500

No files matched your search

+1
View File
@@ -15,6 +15,7 @@ interface IIndexable<V> {
}
function main(): void {
var sys = ts.sys;
if (sys.args.length < 1) {
sys.write("Usage:" + sys.newLine)
sys.write("\tnode processDiagnosticMessages.js <diagnostic-json-input-file>" + sys.newLine);
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
@@ -1,11 +0,0 @@
// @includeBuiltFile: typescript.d.ts
// @noImplicitAny: true
// @target: ES3
// @module: CommonJs
// @noresolve: true
import ts = require("typescript");
var sourceFile = ts.createSourceFile("file1.ts", "var x = 0;", ts.ScriptTarget.Latest);
var program = ts.createProgram(["file1.ts"], {}, undefined);
@@ -1,7 +0,0 @@
// @includeBuiltFile: typescriptServices.d.ts
// @noImplicitAny: true
// @target: ES3
var sourceFile = ts.createSourceFile("file1.ts", "var x = 0;", ts.ScriptTarget.Latest);
var program = ts.createProgram(["file1.ts"], {}, undefined);