Merge pull request microsoft#3011 from frankwallis/master

mhegazy · mhegazy · commit 3eaf2cf7247c · 2015-05-03T14:31:08.000-07:00
Rename parameter static -&gt; isStatic, fixes 'static is a reserved identif...
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -3481,10 +3481,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
                 }
             }
 
-            function getInitializedProperties(node: ClassLikeDeclaration, static: boolean) {
+            function getInitializedProperties(node: ClassLikeDeclaration, isStatic: boolean) {
                 let properties: PropertyDeclaration[] = [];
                 for (let member of node.members) {
-                    if (member.kind === SyntaxKind.PropertyDeclaration && static === ((member.flags & NodeFlags.Static) !== 0) && (<PropertyDeclaration>member).initializer) {
+                    if (member.kind === SyntaxKind.PropertyDeclaration && isStatic === ((member.flags & NodeFlags.Static) !== 0) && (<PropertyDeclaration>member).initializer) {
                         properties.push(<PropertyDeclaration>member);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -3481,10 +3481,10 @@ var __param = (this && this.__param) \|\| function (paramIndex, decorator) {`
`3481`	`3481`	`}`
`3482`	`3482`	`}`
`3483`	`3483`
`3484`		`- function getInitializedProperties(node: ClassLikeDeclaration, static: boolean) {`
	`3484`	`+ function getInitializedProperties(node: ClassLikeDeclaration, isStatic: boolean) {`
`3485`	`3485`	`let properties: PropertyDeclaration[] = [];`
`3486`	`3486`	`for (let member of node.members) {`
`3487`		`- if (member.kind === SyntaxKind.PropertyDeclaration && static === ((member.flags & NodeFlags.Static) !== 0) && (<PropertyDeclaration>member).initializer) {`
	`3487`	`+ if (member.kind === SyntaxKind.PropertyDeclaration && isStatic === ((member.flags & NodeFlags.Static) !== 0) && (<PropertyDeclaration>member).initializer) {`
`3488`	`3488`	`properties.push(<PropertyDeclaration>member);`
`3489`	`3489`	`}`
`3490`	`3490`	`}`