From dfc97db32325ed86ff86e51f6091714aa21dda65 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Thu, 11 Jul 2019 14:26:03 -0400
Subject: [PATCH] Don't add extra indentation for objects inside function
 parameters

---
 src/services/formatting/smartIndenter.ts      |  3 ++-
 ...dentionsOfObjectsInAListAfterFormatting.ts |  2 +-
 .../formatMultipleFunctionArguments.ts        | 26 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/formatMultipleFunctionArguments.ts

diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index 0c9e7b186f..62f4c3c556 100644
--- a/src/services/formatting/smartIndenter.ts
+++ b/src/services/formatting/smartIndenter.ts
@@ -482,7 +482,6 @@ namespace ts.formatting {
                 case SyntaxKind.ArrayLiteralExpression:
                 case SyntaxKind.Block:
                 case SyntaxKind.ModuleBlock:
-                case SyntaxKind.ObjectLiteralExpression:
                 case SyntaxKind.TypeLiteral:
                 case SyntaxKind.MappedType:
                 case SyntaxKind.TupleType:
@@ -524,6 +523,8 @@ namespace ts.formatting {
                         return rangeIsOnOneLine(sourceFile, child!);
                     }
                     return true;
+                case SyntaxKind.CallExpression:
+                    return childKind !== SyntaxKind.ObjectLiteralExpression
                 case SyntaxKind.DoStatement:
                 case SyntaxKind.WhileStatement:
                 case SyntaxKind.ForInStatement:
diff --git a/tests/cases/fourslash/consistenceOnIndentionsOfObjectsInAListAfterFormatting.ts b/tests/cases/fourslash/consistenceOnIndentionsOfObjectsInAListAfterFormatting.ts
index 14ada20602..bbcdaec9ca 100644
--- a/tests/cases/fourslash/consistenceOnIndentionsOfObjectsInAListAfterFormatting.ts
+++ b/tests/cases/fourslash/consistenceOnIndentionsOfObjectsInAListAfterFormatting.ts
@@ -8,4 +8,4 @@ format.document();
 goTo.marker("1");
 verify.currentLineContentIs("}, {");
 goTo.marker("2");
-verify.currentLineContentIs("    });");
\ No newline at end of file
+verify.currentLineContentIs("});");
diff --git a/tests/cases/fourslash/formatMultipleFunctionArguments.ts b/tests/cases/fourslash/formatMultipleFunctionArguments.ts
new file mode 100644
index 0000000000..1e3909305a
--- /dev/null
+++ b/tests/cases/fourslash/formatMultipleFunctionArguments.ts
@@ -0,0 +1,26 @@
+/// <reference path="fourslash.ts"/>
+
+////
+////  someRandomFunction({
+////    prop1: 1,
+////    prop2: 2
+////  }, {
+////    prop3: 3,
+////    prop4: 4
+////  }, {
+////    prop5: 5,
+////    prop6: 6
+////  });
+
+format.document();
+verify.currentFileContentIs(`
+someRandomFunction({
+    prop1: 1,
+    prop2: 2
+}, {
+    prop3: 3,
+    prop4: 4
+}, {
+    prop5: 5,
+    prop6: 6
+});`);