Skip to content

Commit 947abf5

Browse files
ahejlsbergahejlsberg
committed
Merge branch 'master' into literalEnumTypes
# Conflicts: # src/compiler/checker.ts # src/compiler/diagnosticMessages.json # src/compiler/types.ts # src/compiler/utilities.ts # src/services/completions.ts
2 parents ceb78f9 + fc306ba commit 947abf5

527 files changed

Lines changed: 141441 additions & 64727 deletions

File tree

Some content is hidden

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

‎Gulpfile.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ gulp.task(loggedIOJsPath, /*help*/ false, [], (done) => {
935935
const temp = path.join(builtLocalDirectory, "temp");
936936
mkdirP(temp, (err) => {
937937
if (err) { console.error(err); done(err); process.exit(1); }
938-
exec(host, [LKGCompiler, "--types --outdir", temp, loggedIOpath], () => {
938+
exec(host, [LKGCompiler, "--types", "--target es5", "--lib es5", "--outdir", temp, loggedIOpath], () => {
939939
fs.renameSync(path.join(temp, "/harness/loggedIO.js"), loggedIOJsPath);
940940
del(temp).then(() => done(), done);
941941
}, done);
@@ -946,7 +946,13 @@ const instrumenterPath = path.join(harnessDirectory, "instrumenter.ts");
946946
const instrumenterJsPath = path.join(builtLocalDirectory, "instrumenter.js");
947947
gulp.task(instrumenterJsPath, /*help*/ false, [servicesFile], () => {
948948
const settings: tsc.Settings = getCompilerSettings({
949-
outFile: instrumenterJsPath
949+
outFile: instrumenterJsPath,
950+
target: "es5",
951+
lib: [
952+
"es6",
953+
"dom",
954+
"scripthost"
955+
]
950956
}, /*useBuiltCompiler*/ true);
951957
return gulp.src(instrumenterPath)
952958
.pipe(newer(instrumenterJsPath))

‎lib/cancellationToken.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function createCancellationToken(args) {
4949
return {
5050
isCancellationRequested: function () { return perRequestPipeName_1 !== undefined && pipeExists(perRequestPipeName_1); },
5151
setRequest: function (requestId) {
52-
currentRequestId_1 = currentRequestId_1;
52+
currentRequestId_1 = requestId;
5353
perRequestPipeName_1 = namePrefix_1 + requestId;
5454
},
5555
resetRequest: function (requestId) {

‎lib/lib.d.ts‎

Lines changed: 549 additions & 329 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)