Skip to content

Commit d7e9609

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into ownJsonParsing
2 parents 6f568b3 + 25796f0 commit d7e9609

575 files changed

Lines changed: 143074 additions & 64713 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.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
22
[![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
3-
[![Downloads](https://img.shields.io/npm/dm/TypeScript.svg)](https://www.npmjs.com/package/typescript)
3+
[![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
44

55
# TypeScript
66

‎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)