From dff9849ac935c13f7cb184192ec40151a916c7f0 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 18:33:21 -0800
Subject: [PATCH] Make multiLine optional in convertToFunctionBody

---
 src/compiler/factory.ts             | 4 ++--
 src/compiler/transformers/esnext.ts | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 5727081dc78..9c23cfd9b97 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -2343,11 +2343,11 @@ namespace ts {
         return qualifiedName;
     }
 
-    export function convertToFunctionBody(node: ConciseBody) {
+    export function convertToFunctionBody(node: ConciseBody, multiLine?: boolean) {
         if (isBlock(node)) {
             return node;
         }
-        return createBlock([createReturn(node, node)], node, /*multiLine*/ true);
+        return createBlock([createReturn(node, node)], node, multiLine);
     }
 
     function isUseStrictPrologue(node: ExpressionStatement): boolean {
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 85dd29d0725..2a7fb855a92 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -363,14 +363,12 @@ namespace ts {
                     }
                 }
             }
-
             const body = visitNode(node.body, visitor, isConciseBody);
             const trailingStatements = endLexicalEnvironment();
             if (some(leadingStatements) || some(trailingStatements)) {
-                const block = convertToFunctionBody(body);
+                const block = convertToFunctionBody(body, /*multiLine*/ true);
                 return updateBlock(block, createNodeArray(concatenate(concatenate(leadingStatements, block.statements), trailingStatements), block.statements));
             }
-
             return body;
         }
     }