microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-18 07:29:16 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'release-1.5' into sourceMapWithComments-attempt2

Browse Source
This commit is contained in:
Daniel Rosenwasser
2015-04-23 17:07:18 -07:00
parent 2d09dcc16f 70241fdca8
commit cc32e2397f
45 changed files with 294 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/emitter.ts
View File

@@ -23,7 +23,8 @@ var __extends = this.__extends || function (d, b) {
// emit output for the __decorate helper function
const decorateHelper = `
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key, desc) {
var __decorate = this.__decorate || function (decorators, target, key, desc) {
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") return Reflect.decorate(decorators, target, key, desc);
switch (arguments.length) {
case 2: return decorators.reduceRight(function(o, d) { return (d && d(o)) || o; }, target);
case 3: return decorators.reduceRight(function(o, d) { return (d && d(target, key)), void 0; }, void 0);
@@ -33,7 +34,9 @@ var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.deco
// emit output for the __metadata helper function
const metadataHelper = `
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { };`;
var __metadata = this.__metadata || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};`;
// emit output for the __param helper function
const paramHelper = `

2
src/services/shims.ts
View File

@@ -869,4 +869,4 @@ module TypeScript.Services {
}
/* @internal */
let toolsVersion = "1.4";
const toolsVersion = "1.5";