From 667e82fba25c9ab0bb79e73ad6fc9cf57c77848d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 15 Dec 2014 15:16:54 -0800
Subject: [PATCH] Addressing CR feedback + Run fourslash tests with ES5 emit

---
 src/compiler/emitter.ts  | 6 +++++-
 src/harness/fourslash.ts | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 482cba29ff3..20d9585fc00 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2313,6 +2313,7 @@ module ts {
                 var pos = 0;
                 var group = 0;
                 while (pos < length) {
+                    // Emit using the pattern <group0>.concat(<group1>, <group2>, ...)
                     if (group === 1) {
                         write(".concat(");
                     }
@@ -2326,7 +2327,10 @@ module ts {
                         pos++;
                     }
                     else {
-                        for (var i = pos; i < length && elements[i].kind !== SyntaxKind.SpreadElementExpression; i++);
+                        var i = pos;
+                        while (i < length && elements[i].kind !== SyntaxKind.SpreadElementExpression) {
+                            i++;
+                        }
                         write("[");
                         emitList(elements, pos, i - pos, /*multiLine*/ (node.flags & NodeFlags.MultiLine) !== 0,
                             /*trailingComma*/ elements.hasTrailingComma);
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index e253f7b575b..b981ac1d624 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -146,7 +146,7 @@ module FourSlash {
         testOptMetadataNames.outDir, testOptMetadataNames.sourceMap, testOptMetadataNames.sourceRoot]
 
     function convertGlobalOptionsToCompilerOptions(globalOptions: { [idx: string]: string }): ts.CompilerOptions {
-        var settings: ts.CompilerOptions = {};
+        var settings: ts.CompilerOptions = { target: ts.ScriptTarget.ES5 };
         // Convert all property in globalOptions into ts.CompilationSettings
         for (var prop in globalOptions) {
             if (globalOptions.hasOwnProperty(prop)) {