microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 01:04:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fixes indentation of object literals with computed properties

Browse Source
This commit is contained in:
Ron Buckton
2016-04-05 18:24:02 -07:00
parent e3e45c5354
commit 8988ea849b
9 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/printer.ts
View File

@@ -964,9 +964,18 @@ const _super = (function (geti, seti) {
write("{}");
}
else {
const indentedFlag = getNodeEmitFlags(node) & NodeEmitFlags.Indented;
if (indentedFlag) {
increaseIndent();
}
const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
const allowTrailingComma = languageVersion >= ScriptTarget.ES5 ? ListFormat.AllowTrailingComma : ListFormat.None;
emitList(node, properties, ListFormat.ObjectLiteralExpressionProperties | allowTrailingComma | preferNewLine);
if (indentedFlag) {
decreaseIndent();
}
}
}

11
src/compiler/transformers/es6.ts
View File

@@ -1688,10 +1688,13 @@ namespace ts {
addNode(expressions,
createAssignment(
temp,
createObjectLiteral(
visitNodes(properties, visitor, isObjectLiteralElement, 0, numInitialNonComputedProperties),
/*location*/ undefined,
node.multiLine
setNodeEmitFlags(
createObjectLiteral(
visitNodes(properties, visitor, isObjectLiteralElement, 0, numInitialNonComputedProperties),
/*location*/ undefined,
node.multiLine
),
NodeEmitFlags.Indented
)
),
node.multiLine

3
src/compiler/utilities.ts
View File

@@ -1637,6 +1637,9 @@ namespace ts {
const rightHandSideName = (<PropertyAccessExpression>nameExpression).name.text;
return getPropertyNameForKnownSymbolName(rightHandSideName);
}
if (isStringOrNumericLiteral(nameExpression.kind)) {
return (<LiteralExpression>nameExpression).text;
}
}
return undefined;