Skip to content

Commit e7bb2e0

Browse files
committed
Merge branch 'master' into warnaserror
Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json src/compiler/types.ts src/harness/harness.ts
2 parents 4c1397b + 9a5df85 commit e7bb2e0

File tree

1,139 files changed

+50627
-32488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,139 files changed

+50627
-32488
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ build.json
3232
tests/webhost/*.d.ts
3333
tests/webhost/webtsc.js
3434
tests/*.js
35+
tests/*.js.map
3536
tests/*.d.ts
3637
*.config
3738
scripts/debug.bat

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
language: node_js
22

33
node_js:
4-
- '0.10'
4+
- '0.10'
5+
6+
sudo: false
57

68
before_script: npm install -g codeclimate-test-reporter
79

810
after_script:
9-
- cat coverage/lcov.info | codeclimate
11+
- cat coverage/lcov.info | codeclimate
1012

1113
addons:
1214
code_climate:

Jakefile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ var harnessSources = [
8282
].map(function (f) {
8383
return path.join(harnessDirectory, f);
8484
}).concat([
85-
"services/colorization.ts",
86-
"services/documentRegistry.ts"
85+
"services/colorization.ts",
86+
"services/documentRegistry.ts",
87+
"services/preProcessFile.ts"
8788
].map(function (f) {
8889
return path.join(unittestsDirectory, f);
8990
}));
@@ -133,7 +134,7 @@ function concatenateFiles(destinationFile, sourceFiles) {
133134
fs.renameSync(temp, destinationFile);
134135
}
135136

136-
var useDebugMode = false;
137+
var useDebugMode = true;
137138
var generateDeclarations = false;
138139
var host = (process.env.host || process.env.TYPESCRIPT_HOST || "node");
139140
var compilerFilename = "tsc.js";
@@ -148,15 +149,16 @@ var compilerFilename = "tsc.js";
148149
function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile) {
149150
file(outFile, prereqs, function() {
150151
var dir = useBuiltCompiler ? builtLocalDirectory : LKGDirectory;
151-
var options = "-removeComments --module commonjs -noImplicitAny "; //" -propagateEnumConstants "
152+
var options = "-removeComments --module commonjs -noImplicitAny ";
152153
if (generateDeclarations) {
153154
options += "--declaration ";
154155
}
155-
156-
var cmd = host + " " + dir + compilerFilename + " " + options + " ";
156+
157157
if (useDebugMode) {
158-
cmd = cmd + " " + path.join(harnessDirectory, "external/es5compat.ts") + " " + path.join(harnessDirectory, "external/json2.ts") + " ";
158+
options += "--preserveConstEnums ";
159159
}
160+
161+
var cmd = host + " " + dir + compilerFilename + " " + options + " ";
160162
cmd = cmd + sources.join(" ") + (!noOutFile ? " -out " + outFile : "");
161163
if (useDebugMode) {
162164
cmd = cmd + " -sourcemap -mapRoot file:///" + path.resolve(path.dirname(outFile));
@@ -258,12 +260,11 @@ task("local", ["generate-diagnostics", "lib", tscFile, servicesFile]);
258260

259261

260262
// Local target to build the compiler and services
261-
desc("Emit debug mode files with sourcemaps");
262-
task("debug", function() {
263-
useDebugMode = true;
263+
desc("Sets release mode flag");
264+
task("release", function() {
265+
useDebugMode = false;
264266
});
265267

266-
267268
// Set the default task to "local"
268269
task("default", ["local"]);
269270

@@ -312,7 +313,7 @@ task("generate-spec", [specMd])
312313

313314
// Makes a new LKG. This target does not build anything, but errors if not all the outputs are present in the built/local directory
314315
desc("Makes a new LKG out of the built js files");
315-
task("LKG", libraryTargets, function() {
316+
task("LKG", ["clean", "release", "local"].concat(libraryTargets), function() {
316317
var expectedFiles = [tscFile, servicesFile].concat(libraryTargets);
317318
var missingFiles = expectedFiles.filter(function (f) {
318319
return !fs.existsSync(f);

bin/tsc.js

Lines changed: 3428 additions & 3087 deletions
Large diffs are not rendered by default.

bin/typescriptServices.js

Lines changed: 9564 additions & 10641 deletions
Large diffs are not rendered by default.
19.9 KB
Binary file not shown.
118 KB
Binary file not shown.
-8.83 KB
Binary file not shown.
8.77 KB
Binary file not shown.

doc/spec.md

Lines changed: 326 additions & 252 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)