JavaScriptBench
diff --git a/Collapse file
‎src/services/formatting/formatting.ts‎
Copy file name to clipboardExpand all lines: src/services/formatting/formatting.ts
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/services/formatting/formatting.ts‎
Copy file name to clipboardExpand all lines: src/services/formatting/formatting.ts
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎src/services/formatting/smartIndenter.ts‎
Copy file name to clipboardExpand all lines: src/services/formatting/smartIndenter.ts
+16-2Lines changed: 16 additions & 2 deletions b/Collapse file
‎src/services/formatting/smartIndenter.ts‎
Copy file name to clipboardExpand all lines: src/services/formatting/smartIndenter.ts
+16-2Lines changed: 16 additions & 2 deletions
diff --git a/Collapse file
‎tests/cases/fourslash/formattingObjectLiteralOpenCurlyNewline.ts‎
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/Collapse file
‎tests/cases/fourslash/formattingObjectLiteralOpenCurlyNewline.ts‎
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/Collapse file
‎tests/cases/fourslash/formattingObjectLiteralOpenCurlyNewlineTyping.ts‎
Copy file name to clipboard
+36Lines changed: 36 additions & 0 deletions b/Collapse file
‎tests/cases/fourslash/formattingObjectLiteralOpenCurlyNewlineTyping.ts‎
Copy file name to clipboard
+36Lines changed: 36 additions & 0 deletions
@@ -581,7 +581,7 @@ namespace ts.formatting {
                     && !(node.decorators && kind === getFirstNonDecoratorTokenOfNode(node));
             }
 
-            function getDelta(child: TextRangeWithKind) {
+            function getDelta(child: Node) {
                 // Delta value should be zero when the node explicitly prevents indentation of the child node
                 return SmartIndenter.nodeWillIndentChild(node, child, /*indentByDefault*/ true) ? delta : 0;
             }
 
@@ -531,9 +531,23 @@ namespace ts.formatting {
             return false;
         }
 
-        export function nodeWillIndentChild(parent: TextRangeWithKind, child: TextRangeWithKind | undefined, indentByDefault: boolean): boolean {
+        export function nodeWillIndentChild(parent: TextRangeWithKind, child: Node | undefined, indentByDefault: boolean): boolean {
             const childKind = child ? child.kind : SyntaxKind.Unknown;
+
             switch (parent.kind) {
+                case SyntaxKind.VariableDeclaration:
+                case SyntaxKind.PropertyAssignment:
+                case SyntaxKind.ObjectLiteralExpression:
+                    if (childKind === SyntaxKind.ObjectLiteralExpression) {
+                        const sourceFile = child.getSourceFile();
+                        if (sourceFile) {
+                            // May not be defined for synthesized nodes.
+                            const startLine = sourceFile.getLineAndCharacterOfPosition(child.getStart()).line;
+                            const endLine = sourceFile.getLineAndCharacterOfPosition(child.getEnd()).line;
+                            return startLine === endLine;
+                        }
+                    }
+                    break;
                 case SyntaxKind.DoStatement:
                 case SyntaxKind.WhileStatement:
                 case SyntaxKind.ForInStatement:
@@ -585,7 +599,7 @@ namespace ts.formatting {
          * True when the parent node should indent the given child by an explicit rule.
          * @param isNextChild If true, we are judging indent of a hypothetical child *after* this one, not the current child.
          */
-        export function shouldIndentChildNode(parent: TextRangeWithKind, child?: TextRangeWithKind, isNextChild = false): boolean {
+        export function shouldIndentChildNode(parent: TextRangeWithKind, child?: Node, isNextChild = false): boolean {
             return (nodeContentIsAlwaysIndented(parent.kind) || nodeWillIndentChild(parent, child, /*indentByDefault*/ false))
                 && !(isNextChild && child && isControlFlowEndingStatement(child.kind, parent));
         }
 
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+
+//// 
+//// var clear =
+//// {
+////     outerKey:
+////     {
+////         innerKey: 1
+////     }
+//// };
+//// 
+
+format.document();
+verify.currentFileContentIs(
+`
+var clear =
+{
+    outerKey:
+    {
+        innerKey: 1
+    }
+};
+`
+);
@@ -0,0 +1,36 @@
+/// <reference path='fourslash.ts' />
+
+//// 
+//// var varName =/**/
+//// 
+
+goTo.marker();
+edit.insert("\n{");
+verify.currentFileContentIs(
+`
+var varName =
+    {
+`
+);
+
+edit.insert("\na: 1");
+format.document();
+verify.currentFileContentIs(
+`
+var varName =
+{
+    a: 1
+`
+);
+
+edit.insert("\n};");
+
+format.document();
+verify.currentFileContentIs(
+`
+var varName =
+{
+    a: 1
+};
+`
+);
Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ namespace ts.formatting {`
`581`	`581`	`&& !(node.decorators && kind === getFirstNonDecoratorTokenOfNode(node));`
`582`	`582`	`}`
`583`	`583`
`584`		`- function getDelta(child: TextRangeWithKind) {`
	`584`	`+ function getDelta(child: Node) {`
`585`	`585`	`// Delta value should be zero when the node explicitly prevents indentation of the child node`
`586`	`586`	`return SmartIndenter.nodeWillIndentChild(node, child, /indentByDefault/ true) ? delta : 0;`
`587`	`587`	`}`