Merge branch 'refactorEmitter' of https://github.com/Microsoft/TypeScript into refactorEmitter
Conflicts: src/compiler/emitter.ts
This commit is contained in:
commit
e429bd9ba0
1 changed files with 2 additions and 2 deletions
|
@ -3536,14 +3536,14 @@ module ts {
|
||||||
|
|
||||||
// Emit node which needs to be emitted differently depended on ScriptTarget
|
// Emit node which needs to be emitted differently depended on ScriptTarget
|
||||||
if (compilerOptions.target < ScriptTarget.ES6) {
|
if (compilerOptions.target < ScriptTarget.ES6) {
|
||||||
// Emit node down-leveling
|
// Emit node down-level
|
||||||
switch (node.kind) {
|
switch (node.kind) {
|
||||||
case SyntaxKind.ShorthandPropertyAssignment:
|
case SyntaxKind.ShorthandPropertyAssignment:
|
||||||
return emitShorthandPropertyAssignmentAsNormalPropertyAssignment(<ShorthandPropertyDeclaration>node);
|
return emitShorthandPropertyAssignmentAsNormalPropertyAssignment(<ShorthandPropertyDeclaration>node);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (compilerOptions.target >= ScriptTarget.ES6) {
|
else if (compilerOptions.target >= ScriptTarget.ES6) {
|
||||||
// Emit node natively in EcmaScript6
|
// Emit node natively
|
||||||
switch (node.kind) {
|
switch (node.kind) {
|
||||||
case SyntaxKind.ShorthandPropertyAssignment:
|
case SyntaxKind.ShorthandPropertyAssignment:
|
||||||
return emitShorthandPropertyAssignment(<ShorthandPropertyDeclaration>node);
|
return emitShorthandPropertyAssignment(<ShorthandPropertyDeclaration>node);
|
||||||
|
|
Loading…
Reference in a new issue