From 29481f67f4ea767cf6a4c56201710a7250dd2a10 Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Wed, 16 Nov 2016 16:25:23 -0800
Subject: [PATCH 1/3] Revert "fix #11670, support type guards in
 NumberConstructor (#11722)"

This reverts commit 4fbbbed321baa58418b9379b418278d31400fe3e.
---
 src/lib/es2015.core.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
index 28f2e12248b..356512ecf58 100644
--- a/src/lib/es2015.core.d.ts
+++ b/src/lib/es2015.core.d.ts
@@ -205,13 +205,13 @@ interface NumberConstructor {
       * number. Only finite values of the type number, result in true.
       * @param number A numeric value.
       */
-    isFinite(value: any): value is number;
+    isFinite(number: number): boolean;
 
     /**
       * Returns true if the value passed is an integer, false otherwise.
       * @param number A numeric value.
       */
-    isInteger(value: any): value is number;
+    isInteger(number: number): boolean;
 
     /**
       * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
@@ -219,13 +219,13 @@ interface NumberConstructor {
       * to a number. Only values of the type number, that are also NaN, result in true.
       * @param number A numeric value.
       */
-    isNaN(value: any): value is number;
+    isNaN(number: number): boolean;
 
     /**
       * Returns true if the value passed is a safe integer.
       * @param number A numeric value.
       */
-    isSafeInteger(value: any): value is number;
+    isSafeInteger(number: number): boolean;
 
     /**
       * The value of the largest integer n such that n and n + 1 are both exactly representable as

From 3e52f3dfe9ee5922ef4305b1c39bdbca33d0f5f8 Mon Sep 17 00:00:00 2001
From: Anton Khlynovskiy <subzey@gmail.com>
Date: Thu, 17 Nov 2016 22:06:45 +0300
Subject: [PATCH 2/3] Codegen: Do not subtract 0 in arguments to rest array
 loop

---
 src/compiler/transformers/es2015.ts           |  4 +++-
 .../reference/accessorWithRestParam.js        |  4 ++--
 ...patWithCallSignaturesWithRestParameters.js |  6 +++---
 .../reference/baseTypeAfterDerivedType.js     |  2 +-
 .../checkSuperCallBeforeThisAccessing5.js     |  2 +-
 .../checkSuperCallBeforeThisAccessing6.js     |  2 +-
 .../checkSuperCallBeforeThisAccessing8.js     |  2 +-
 .../collisionArgumentsArrowFunctions.js       |  2 +-
 .../collisionArgumentsClassConstructor.js     |  2 +-
 .../collisionArgumentsClassMethod.js          |  2 +-
 .../reference/collisionArgumentsFunction.js   |  2 +-
 .../collisionArgumentsFunctionExpressions.js  |  2 +-
 .../collisionRestParameterArrowFunctions.js   |  2 +-
 .../collisionRestParameterClassConstructor.js |  2 +-
 .../collisionRestParameterClassMethod.js      |  2 +-
 .../collisionRestParameterFunction.js         |  2 +-
 ...llisionRestParameterFunctionExpressions.js |  2 +-
 .../collisionRestParameterUnderscoreIUsage.js |  2 +-
 ...constructorWithIncompleteTypeAnnotation.js |  2 +-
 .../reference/contextuallyTypedIife.js        |  6 +++---
 .../contextuallyTypingRestParameters.js       |  2 +-
 ...RestParametersOfFunctionAndFunctionType.js |  2 +-
 ...ingOptionalBindingParametersInOverloads.js |  4 ++--
 .../reference/defaultExportWithOverloads01.js |  2 +-
 .../destructuringParameterDeclaration4.js     | 14 ++++++-------
 .../destructuringParameterDeclaration6.js     |  6 +++---
 ...detachedCommentAtStartOfLambdaFunction1.js |  2 +-
 ...detachedCommentAtStartOfLambdaFunction2.js |  2 +-
 .../disallowLineTerminatorBeforeArrow.js      |  4 ++--
 .../emitDecoratorMetadata_restArgs.js         |  8 ++++----
 .../reference/emitRestParametersFunction.js   |  2 +-
 .../emitRestParametersFunctionExpression.js   |  6 +++---
 .../emitRestParametersFunctionProperty.js     |  2 +-
 .../reference/emitRestParametersMethod.js     |  6 +++---
 .../emitSkipsThisWithRestParameter.js         |  2 +-
 tests/baselines/reference/es6ClassTest2.js    |  2 +-
 .../reference/es6modulekindWithES5Target6.js  |  2 +-
 .../reference/fatarrowfunctionsErrors.js      |  4 ++--
 .../fatarrowfunctionsOptionalArgs.js          | 20 +++++++++----------
 .../fatarrowfunctionsOptionalArgsErrors1.js   |  6 +++---
 .../fatarrowfunctionsOptionalArgsErrors3.js   |  2 +-
 .../fatarrowfunctionsOptionalArgsErrors4.js   |  2 +-
 tests/baselines/reference/functionCall10.js   |  2 +-
 ...tionOverloadsRecursiveGenericReturnType.js |  2 +-
 tests/baselines/reference/genericRestArgs.js  |  2 +-
 ...icitAnyDeclareFunctionWithoutFormalType.js |  2 +-
 .../inheritedConstructorWithRestParams.js     |  2 +-
 tests/baselines/reference/newWithSpread.js    |  2 +-
 tests/baselines/reference/newWithSpreadES5.js |  2 +-
 .../noImplicitAnyParametersInBareFunctions.js |  4 ++--
 .../noImplicitAnyParametersInClass.js         |  8 ++++----
 .../noImplicitAnyParametersInModule.js        |  4 ++--
 tests/baselines/reference/nonArrayRestArgs.js |  2 +-
 .../optionalBindingParametersInOverloads1.js  |  2 +-
 .../optionalBindingParametersInOverloads2.js  |  2 +-
 .../overloadGenericFunctionWithRestArgs.js    |  2 +-
 .../parenthesizedContexualTyping2.js          |  2 +-
 tests/baselines/reference/parser509668.js     |  2 +-
 .../parserMemberAccessorDeclaration18.js      |  2 +-
 .../reference/parserParameterList10.js        |  2 +-
 .../reference/parserParameterList11.js        |  2 +-
 .../reference/parserParameterList9.js         |  2 +-
 ...tatedFunctionInferenceWithTypeParameter.js |  2 +-
 .../reference/restArgAssignmentCompat.js      |  2 +-
 .../baselines/reference/restArgMissingName.js |  2 +-
 .../reference/restParamAsOptional.js          |  4 ++--
 .../baselines/reference/restParamModifier2.js |  2 +-
 .../restParameterAssignmentCompatibility.js   |  2 +-
 .../restParameterNoTypeAnnotation.js          |  2 +-
 ...estParameterWithoutAnnotationIsAnyArray.js | 10 +++++-----
 .../restParametersOfNonArrayTypes.js          | 10 +++++-----
 .../restParametersOfNonArrayTypes2.js         | 20 +++++++++----------
 .../restParametersWithArrayTypeAnnotations.js | 20 +++++++++----------
 .../reference/restParamsWithNonRestParams.js  |  2 +-
 .../stringLiteralTypeIsSubtypeOfString.js     |  2 +-
 .../stringLiteralTypesOverloads03.js          |  4 ++--
 .../reference/subtypingWithCallSignatures2.js |  4 ++--
 .../reference/subtypingWithCallSignatures3.js |  4 ++--
 ...taggedTemplateStringsHexadecimalEscapes.js |  2 +-
 ...sPlainCharactersThatArePartsOfEscapes01.js |  2 +-
 ...gedTemplateStringsWithMultilineTemplate.js |  2 +-
 ...dTemplateStringsWithOverloadResolution1.js |  2 +-
 ...dTemplateStringsWithOverloadResolution2.js |  4 ++--
 ...tionExpressionsInSubstitutionExpression.js |  2 +-
 ...taggedTemplateStringsWithUnicodeEscapes.js |  2 +-
 ...gedTemplateStringsWithWhitespaceEscapes.js |  2 +-
 ...gCommasInFunctionParametersAndArguments.js |  2 +-
 .../typeArgumentsWithStringLiteralTypes01.js  |  2 +-
 .../reference/typeGuardFunctionErrors.js      |  2 +-
 .../reference/undeclaredModuleError.js        |  2 +-
 .../reference/unionTypeCallSignatures3.js     |  2 +-
 .../unusedParametersWithUnderscore.js         |  4 ++--
 .../varArgConstructorMemberParameter.js       |  4 ++--
 .../reference/varArgParamTypeCheck.js         |  2 +-
 .../reference/varArgWithNoParamName.js        |  2 +-
 tests/baselines/reference/vararg.js           |  2 +-
 96 files changed, 170 insertions(+), 168 deletions(-)

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 838e58ae99b..bc9341a4b4f 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -1306,7 +1306,9 @@ namespace ts {
                             createAssignment(
                                 createElementAccess(
                                     expressionName,
-                                    createSubtract(temp, createLiteral(restIndex))
+                                    restIndex === 0
+                                        ? temp
+                                        : createSubtract(temp, createLiteral(restIndex))
                                 ),
                                 createElementAccess(createIdentifier("arguments"), temp)
                             ),
diff --git a/tests/baselines/reference/accessorWithRestParam.js b/tests/baselines/reference/accessorWithRestParam.js
index a58a7db1c52..871f3ed00ef 100644
--- a/tests/baselines/reference/accessorWithRestParam.js
+++ b/tests/baselines/reference/accessorWithRestParam.js
@@ -13,7 +13,7 @@ var C = (function () {
         set: function () {
             var v = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                v[_i - 0] = arguments[_i];
+                v[_i] = arguments[_i];
             }
         },
         enumerable: true,
@@ -23,7 +23,7 @@ var C = (function () {
         set: function () {
             var v2 = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                v2[_i - 0] = arguments[_i];
+                v2[_i] = arguments[_i];
             }
         },
         enumerable: true,
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js
index f4cf5cc79e2..ec86f218ac0 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js
@@ -52,14 +52,14 @@ a = function () { return 1; }; // ok, same number of required params
 a = function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return 1;
 }; // ok, same number of required params
 a = function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return 1;
 }; // error, type mismatch
@@ -72,7 +72,7 @@ a2 = function () { return 1; }; // ok, fewer required params
 a2 = function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return 1;
 }; // ok, fewer required params
diff --git a/tests/baselines/reference/baseTypeAfterDerivedType.js b/tests/baselines/reference/baseTypeAfterDerivedType.js
index b80b62712f5..c4ca7cf7b33 100644
--- a/tests/baselines/reference/baseTypeAfterDerivedType.js
+++ b/tests/baselines/reference/baseTypeAfterDerivedType.js
@@ -23,7 +23,7 @@ var Derived2 = (function () {
     Derived2.prototype.method = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     };
     return Derived2;
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
index 8c7f18b77f6..4cce975d6d9 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -17,7 +17,7 @@ var Based = (function () {
     function Based() {
         var arg = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            arg[_i - 0] = arguments[_i];
+            arg[_i] = arguments[_i];
         }
     }
     return Based;
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
index cc8912230ab..782e3236271 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -20,7 +20,7 @@ var Base = (function () {
     function Base() {
         var arg = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            arg[_i - 0] = arguments[_i];
+            arg[_i] = arguments[_i];
         }
     }
     return Base;
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
index 25a480b9b57..5dd3708a3bb 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -20,7 +20,7 @@ var Base = (function () {
     function Base() {
         var arg = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            arg[_i - 0] = arguments[_i];
+            arg[_i] = arguments[_i];
         }
     }
     return Base;
diff --git a/tests/baselines/reference/collisionArgumentsArrowFunctions.js b/tests/baselines/reference/collisionArgumentsArrowFunctions.js
index 0aa939e1a2d..3e56b8b2f9c 100644
--- a/tests/baselines/reference/collisionArgumentsArrowFunctions.js
+++ b/tests/baselines/reference/collisionArgumentsArrowFunctions.js
@@ -37,7 +37,7 @@ var f1NoError = function (arguments) {
 var f2 = function () {
     var restParameters = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        restParameters[_i - 0] = arguments[_i];
+        restParameters[_i] = arguments[_i];
     }
     var arguments = 10; // No Error
 };
diff --git a/tests/baselines/reference/collisionArgumentsClassConstructor.js b/tests/baselines/reference/collisionArgumentsClassConstructor.js
index 570b10d39d3..57ffa88f4e1 100644
--- a/tests/baselines/reference/collisionArgumentsClassConstructor.js
+++ b/tests/baselines/reference/collisionArgumentsClassConstructor.js
@@ -118,7 +118,7 @@ var c2 = (function () {
     function c2() {
         var restParameters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            restParameters[_i - 0] = arguments[_i];
+            restParameters[_i] = arguments[_i];
         }
         var arguments = 10; // no error
     }
diff --git a/tests/baselines/reference/collisionArgumentsClassMethod.js b/tests/baselines/reference/collisionArgumentsClassMethod.js
index a20e0385e6a..85610926e35 100644
--- a/tests/baselines/reference/collisionArgumentsClassMethod.js
+++ b/tests/baselines/reference/collisionArgumentsClassMethod.js
@@ -94,7 +94,7 @@ var c3 = (function () {
     c3.prototype.foo = function () {
         var restParameters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            restParameters[_i - 0] = arguments[_i];
+            restParameters[_i] = arguments[_i];
         }
         var arguments = 10; // no error
     };
diff --git a/tests/baselines/reference/collisionArgumentsFunction.js b/tests/baselines/reference/collisionArgumentsFunction.js
index 9ce4a5ab0e2..c6a26baa495 100644
--- a/tests/baselines/reference/collisionArgumentsFunction.js
+++ b/tests/baselines/reference/collisionArgumentsFunction.js
@@ -66,7 +66,7 @@ function f1NoError(arguments) {
 function f3() {
     var restParameters = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        restParameters[_i - 0] = arguments[_i];
+        restParameters[_i] = arguments[_i];
     }
     var arguments = 10; // no error
 }
diff --git a/tests/baselines/reference/collisionArgumentsFunctionExpressions.js b/tests/baselines/reference/collisionArgumentsFunctionExpressions.js
index 405ceb625c3..b3389ddbf4a 100644
--- a/tests/baselines/reference/collisionArgumentsFunctionExpressions.js
+++ b/tests/baselines/reference/collisionArgumentsFunctionExpressions.js
@@ -56,7 +56,7 @@ function foo() {
     function f3() {
         var restParameters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            restParameters[_i - 0] = arguments[_i];
+            restParameters[_i] = arguments[_i];
         }
         var arguments = 10; // no error
     }
diff --git a/tests/baselines/reference/collisionRestParameterArrowFunctions.js b/tests/baselines/reference/collisionRestParameterArrowFunctions.js
index 39d449555db..3e20f48a4d0 100644
--- a/tests/baselines/reference/collisionRestParameterArrowFunctions.js
+++ b/tests/baselines/reference/collisionRestParameterArrowFunctions.js
@@ -27,7 +27,7 @@ var f1NoError = function (_i) {
 var f2 = function () {
     var restParameters = [];
     for (var _a = 0; _a < arguments.length; _a++) {
-        restParameters[_a - 0] = arguments[_a];
+        restParameters[_a] = arguments[_a];
     }
     var _i = 10; // No Error
 };
diff --git a/tests/baselines/reference/collisionRestParameterClassConstructor.js b/tests/baselines/reference/collisionRestParameterClassConstructor.js
index 82d2ddc0896..f97e49531f6 100644
--- a/tests/baselines/reference/collisionRestParameterClassConstructor.js
+++ b/tests/baselines/reference/collisionRestParameterClassConstructor.js
@@ -88,7 +88,7 @@ var c2 = (function () {
     function c2() {
         var restParameters = [];
         for (var _a = 0; _a < arguments.length; _a++) {
-            restParameters[_a - 0] = arguments[_a];
+            restParameters[_a] = arguments[_a];
         }
         var _i = 10; // no error
     }
diff --git a/tests/baselines/reference/collisionRestParameterClassMethod.js b/tests/baselines/reference/collisionRestParameterClassMethod.js
index eb92faa7b2a..cda717c79ab 100644
--- a/tests/baselines/reference/collisionRestParameterClassMethod.js
+++ b/tests/baselines/reference/collisionRestParameterClassMethod.js
@@ -70,7 +70,7 @@ var c3 = (function () {
     c3.prototype.foo = function () {
         var restParameters = [];
         for (var _a = 0; _a < arguments.length; _a++) {
-            restParameters[_a - 0] = arguments[_a];
+            restParameters[_a] = arguments[_a];
         }
         var _i = 10; // no error
     };
diff --git a/tests/baselines/reference/collisionRestParameterFunction.js b/tests/baselines/reference/collisionRestParameterFunction.js
index 8660e8f5db0..651062a696c 100644
--- a/tests/baselines/reference/collisionRestParameterFunction.js
+++ b/tests/baselines/reference/collisionRestParameterFunction.js
@@ -48,7 +48,7 @@ function f1NoError(_i) {
 function f3() {
     var restParameters = [];
     for (var _a = 0; _a < arguments.length; _a++) {
-        restParameters[_a - 0] = arguments[_a];
+        restParameters[_a] = arguments[_a];
     }
     var _i = 10; // no error
 }
diff --git a/tests/baselines/reference/collisionRestParameterFunctionExpressions.js b/tests/baselines/reference/collisionRestParameterFunctionExpressions.js
index 22709b087eb..87bafea09bd 100644
--- a/tests/baselines/reference/collisionRestParameterFunctionExpressions.js
+++ b/tests/baselines/reference/collisionRestParameterFunctionExpressions.js
@@ -39,7 +39,7 @@ function foo() {
     function f3() {
         var restParameters = [];
         for (var _a = 0; _a < arguments.length; _a++) {
-            restParameters[_a - 0] = arguments[_a];
+            restParameters[_a] = arguments[_a];
         }
         var _i = 10; // no error
     }
diff --git a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
index 97e82a1523f..1d7f9f43f7c 100644
--- a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
+++ b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
@@ -14,7 +14,7 @@ var Foo = (function () {
     function Foo() {
         var args = [];
         for (var _a = 0; _a < arguments.length; _a++) {
-            args[_a - 0] = arguments[_a];
+            args[_a] = arguments[_a];
         }
         console.log(_i); // This should result in error
     }
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
index 1ee309b0eb4..d4cd737ab46 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -297,7 +297,7 @@ var TypeScriptAllInOne;
         Program.Main = function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i - 0] = arguments[_i];
+                args[_i] = arguments[_i];
             }
             try {
                 var bfs = new BasicFeatures();
diff --git a/tests/baselines/reference/contextuallyTypedIife.js b/tests/baselines/reference/contextuallyTypedIife.js
index 0a84e45e30b..d2eaaf9c2d5 100644
--- a/tests/baselines/reference/contextuallyTypedIife.js
+++ b/tests/baselines/reference/contextuallyTypedIife.js
@@ -57,21 +57,21 @@ let eleven = (o => o.a(11))({ a: function(n) { return n; } });
 (function () {
     var numbers = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        numbers[_i - 0] = arguments[_i];
+        numbers[_i] = arguments[_i];
     }
     return numbers.every(function (n) { return n > 0; });
 })(5, 6, 7);
 (function () {
     var mixed = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        mixed[_i - 0] = arguments[_i];
+        mixed[_i] = arguments[_i];
     }
     return mixed.every(function (n) { return !!n; });
 })(5, 'oops', 'oh no');
 (function () {
     var noNumbers = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        noNumbers[_i - 0] = arguments[_i];
+        noNumbers[_i] = arguments[_i];
     }
     return noNumbers.some(function (n) { return n > 0; });
 })();
diff --git a/tests/baselines/reference/contextuallyTypingRestParameters.js b/tests/baselines/reference/contextuallyTypingRestParameters.js
index 17561f5d7fc..8a1f2ffbdfb 100644
--- a/tests/baselines/reference/contextuallyTypingRestParameters.js
+++ b/tests/baselines/reference/contextuallyTypingRestParameters.js
@@ -11,7 +11,7 @@ var x: (...y: string[]) => void = function (.../*3*/y) {
 var x = function () {
     var y = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        y[_i - 0] = arguments[_i];
+        y[_i] = arguments[_i];
     }
     var t = y;
     var x2 = t; // This should be error
diff --git a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
index 563551d67a8..894f50fc5ab 100644
--- a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
+++ b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
@@ -14,7 +14,7 @@ var f6 = () => { return [<any>10]; }
 function f1() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 function f2(x) { }
diff --git a/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.js b/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.js
index a3cdee31222..941bb383f81 100644
--- a/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.js
+++ b/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.js
@@ -13,13 +13,13 @@ function foo2(...rest: any[]) {
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 function foo2() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 
diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js
index f88d60182db..770b685378d 100644
--- a/tests/baselines/reference/defaultExportWithOverloads01.js
+++ b/tests/baselines/reference/defaultExportWithOverloads01.js
@@ -10,7 +10,7 @@ export default function f(...args: any[]) {
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.js b/tests/baselines/reference/destructuringParameterDeclaration4.js
index 44838d600d8..52007df17c9 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.js
@@ -43,31 +43,31 @@ foo1(1, 2, "string", E1.a, E.b);  // Error
 function a0() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 } // Error, rest parameter must be array type
 function a1() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 function a2() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 } // Error, rest parameter must be array type
 function a3() {
     var b = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        b[_i - 0] = arguments[_i];
+        b[_i] = arguments[_i];
     }
 } // Error, can't be optional
 function a4() {
     var b = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        b[_i - 0] = arguments[_i];
+        b[_i] = arguments[_i];
     }
 } // Error, can't have initializer
 function a5(_a) {
@@ -86,7 +86,7 @@ var C = (function () {
     function C() {
         var temp = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            temp[_i - 0] = arguments[_i];
+            temp[_i] = arguments[_i];
         }
         this.temp = temp;
     } // Error, rest parameter can't have properties
@@ -96,7 +96,7 @@ var C = (function () {
 function foo1() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 }
 foo1(1, 2, "string", E1.a, E.b); // Error
diff --git a/tests/baselines/reference/destructuringParameterDeclaration6.js b/tests/baselines/reference/destructuringParameterDeclaration6.js
index 03307415b65..a8c7f65211f 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration6.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration6.js
@@ -40,20 +40,20 @@ while (, )
 function a5() {
     var  = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        [_i - 0] = arguments[_i];
+        [_i] = arguments[_i];
     }
 }
 while () { }
 function a6() {
     var public = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        public[_i - 0] = arguments[_i];
+        public[_i] = arguments[_i];
     }
 }
 function a7() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 }
 a({ "while": 1 });
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
index 51ae4090ae1..495ac29f269 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
@@ -19,7 +19,7 @@ var TestFile = (function () {
         return function () {
             var x = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                x[_i - 0] = arguments[_i];
+                x[_i] = arguments[_i];
             }
             /// <summary>Test summary</summary>
             /// <param name="message" type="String" />
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
index 22dfe4bbc44..e6ced9a8a42 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
@@ -23,7 +23,7 @@ var TestFile = (function () {
             /// <returns type="Function" />
             var x = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                x[_i - 0] = arguments[_i];
+                x[_i] = arguments[_i];
             }
             return message + _this.name;
         };
diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
index 0c6b98def4f..9f0d04d301c 100644
--- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
+++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
@@ -92,13 +92,13 @@ var f4 = function (x, y) {
 var f5 = function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 };
 var f6 = function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 };
 var f7 = function (x, y, z) {
diff --git a/tests/baselines/reference/emitDecoratorMetadata_restArgs.js b/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
index ec8240b2642..4bc1f023212 100644
--- a/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
+++ b/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
@@ -32,13 +32,13 @@ var A = (function () {
     function A() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     }
     A.prototype.method = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     };
     return A;
@@ -57,13 +57,13 @@ var B = (function () {
     function B() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     }
     B.prototype.method = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     };
     return B;
diff --git a/tests/baselines/reference/emitRestParametersFunction.js b/tests/baselines/reference/emitRestParametersFunction.js
index 01116f2ac92..dff77ad4b55 100644
--- a/tests/baselines/reference/emitRestParametersFunction.js
+++ b/tests/baselines/reference/emitRestParametersFunction.js
@@ -6,7 +6,7 @@ function foo(x: number, y: string, ...rest) { }
 function bar() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 function foo(x, y) {
diff --git a/tests/baselines/reference/emitRestParametersFunctionExpression.js b/tests/baselines/reference/emitRestParametersFunctionExpression.js
index da87cc79f2d..55d4b505808 100644
--- a/tests/baselines/reference/emitRestParametersFunctionExpression.js
+++ b/tests/baselines/reference/emitRestParametersFunctionExpression.js
@@ -9,7 +9,7 @@ var funcExp3 = (function (...rest) { })()
 var funcExp = function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 };
 var funcExp1 = function (X) {
@@ -21,12 +21,12 @@ var funcExp1 = function (X) {
 var funcExp2 = function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 };
 var funcExp3 = (function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 })();
diff --git a/tests/baselines/reference/emitRestParametersFunctionProperty.js b/tests/baselines/reference/emitRestParametersFunctionProperty.js
index 4fd60a9269d..99d004daeb2 100644
--- a/tests/baselines/reference/emitRestParametersFunctionProperty.js
+++ b/tests/baselines/reference/emitRestParametersFunctionProperty.js
@@ -13,7 +13,7 @@ var obj2 = {
     func: function () {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/emitRestParametersMethod.js b/tests/baselines/reference/emitRestParametersMethod.js
index 1dec771cde8..fed2138f36b 100644
--- a/tests/baselines/reference/emitRestParametersMethod.js
+++ b/tests/baselines/reference/emitRestParametersMethod.js
@@ -24,7 +24,7 @@ var C = (function () {
     C.prototype.bar = function () {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
     };
     C.prototype.foo = function (x) {
@@ -39,13 +39,13 @@ var D = (function () {
     function D() {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
     }
     D.prototype.bar = function () {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
     };
     D.prototype.foo = function (x) {
diff --git a/tests/baselines/reference/emitSkipsThisWithRestParameter.js b/tests/baselines/reference/emitSkipsThisWithRestParameter.js
index d1e99f9409d..5645a7e0636 100644
--- a/tests/baselines/reference/emitSkipsThisWithRestParameter.js
+++ b/tests/baselines/reference/emitSkipsThisWithRestParameter.js
@@ -11,7 +11,7 @@ function rebase(fn) {
     return function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
         return fn.apply(this, [this].concat(args));
     };
diff --git a/tests/baselines/reference/es6ClassTest2.js b/tests/baselines/reference/es6ClassTest2.js
index de5657b087e..533b332422d 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -236,7 +236,7 @@ var SplatMonster = (function () {
     function SplatMonster() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     }
     SplatMonster.prototype.roar = function (name) {
diff --git a/tests/baselines/reference/es6modulekindWithES5Target6.js b/tests/baselines/reference/es6modulekindWithES5Target6.js
index d305c60e54e..cff2327dacb 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target6.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target6.js
@@ -17,7 +17,7 @@ export function f1(d) {
 export function f2() {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
 }
 export default function f3(d) {
diff --git a/tests/baselines/reference/fatarrowfunctionsErrors.js b/tests/baselines/reference/fatarrowfunctionsErrors.js
index ced4660d8d1..0f318f1aa84 100644
--- a/tests/baselines/reference/fatarrowfunctionsErrors.js
+++ b/tests/baselines/reference/fatarrowfunctionsErrors.js
@@ -16,7 +16,7 @@ var x4= (...a: any[]) { };
 foo(function () {
     var Far = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        Far[_i - 0] = arguments[_i];
+        Far[_i] = arguments[_i];
     }
     return 0;
 });
@@ -36,6 +36,6 @@ var x3 = function (a) { };
 var x4 = function () {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 };
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js
index e6e43f8bbf4..f7e49680f8a 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js
@@ -159,7 +159,7 @@ foo(
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 8;
 });
@@ -203,7 +203,7 @@ foo(
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 28;
 });
@@ -226,7 +226,7 @@ false ? function (arg) {
 false ? function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 48;
 } : null;
@@ -247,7 +247,7 @@ false ? (function (arg) {
 false ? (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 58;
 }) : null;
@@ -268,7 +268,7 @@ false ? null : function (arg) {
 false ? null : function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 68;
 };
@@ -294,7 +294,7 @@ false ? null : function () {
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 96;
 }) instanceof Function;
@@ -326,13 +326,13 @@ false ? null : function () {
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 0;
 }) + '' + (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 107;
 });
@@ -354,7 +354,7 @@ false ? null : function () {
 function foo() {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
 }
 foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) {
@@ -371,7 +371,7 @@ foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) {
 }, function () {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
     return 119;
 }, function (a, b) {
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js
index 4d27f8230eb..edbc897922c 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js
@@ -12,21 +12,21 @@
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 102;
 });
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 103;
 });
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 104;
 });
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors3.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors3.js
index 665c5244016..d5d4b099a06 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors3.js
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors3.js
@@ -6,7 +6,7 @@
 (function () {
     var  = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        [_i - 0] = arguments[_i];
+        [_i] = arguments[_i];
     }
     return 105;
 });
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js
index dfd7e9f74dc..0fbf4b7486e 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js
@@ -56,7 +56,7 @@ foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) {
 }, function () {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
     return 119;
 }, function (a, b) {
diff --git a/tests/baselines/reference/functionCall10.js b/tests/baselines/reference/functionCall10.js
index 9d5cb33a56a..51ed76990b3 100644
--- a/tests/baselines/reference/functionCall10.js
+++ b/tests/baselines/reference/functionCall10.js
@@ -10,7 +10,7 @@ foo(1, 'bar');
 function foo() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 }
 ;
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
index 1d38d65ad38..b616d18c974 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
@@ -28,7 +28,7 @@ var A = (function () {
 function Choice() {
     var v_args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        v_args[_i - 0] = arguments[_i];
+        v_args[_i] = arguments[_i];
     }
     return new A();
 }
diff --git a/tests/baselines/reference/genericRestArgs.js b/tests/baselines/reference/genericRestArgs.js
index 75c88d7cbf2..1cfeb61e169 100644
--- a/tests/baselines/reference/genericRestArgs.js
+++ b/tests/baselines/reference/genericRestArgs.js
@@ -16,7 +16,7 @@ var a2Gc = makeArrayG<any[]>(1, ""); // error
 function makeArrayG() {
     var items = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        items[_i - 0] = arguments[_i];
+        items[_i] = arguments[_i];
     }
     return items;
 }
diff --git a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js
index c13479daff3..0b2ba6191ef 100644
--- a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js
+++ b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js
@@ -22,7 +22,7 @@ function func2(a, b, c) { }
 function func3() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 ; // error at "args" 
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams.js b/tests/baselines/reference/inheritedConstructorWithRestParams.js
index c9db1756676..6a30836d728 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js
@@ -24,7 +24,7 @@ var Base = (function () {
     function Base() {
         var a = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            a[_i - 0] = arguments[_i];
+            a[_i] = arguments[_i];
         }
     }
     return Base;
diff --git a/tests/baselines/reference/newWithSpread.js b/tests/baselines/reference/newWithSpread.js
index 91c502e50b9..c6ea3b44c15 100644
--- a/tests/baselines/reference/newWithSpread.js
+++ b/tests/baselines/reference/newWithSpread.js
@@ -107,7 +107,7 @@ function f(x, y) {
 function f2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var B = (function () {
diff --git a/tests/baselines/reference/newWithSpreadES5.js b/tests/baselines/reference/newWithSpreadES5.js
index 92904062d0a..125ac9f0412 100644
--- a/tests/baselines/reference/newWithSpreadES5.js
+++ b/tests/baselines/reference/newWithSpreadES5.js
@@ -106,7 +106,7 @@ function f(x, y) {
 function f2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var B = (function () {
diff --git a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
index 8efe32d3140..3b0b630b537 100644
--- a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
+++ b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
@@ -59,7 +59,7 @@ function f5(x, y, z) { }
 function f6() {
     var r = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        r[_i - 0] = arguments[_i];
+        r[_i] = arguments[_i];
     }
 }
 // Implicit-'any'/'any[]' errors for x, r.
@@ -82,7 +82,7 @@ var f12 = function (x, y, z) { return ""; };
 var f13 = function () {
     var r = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        r[_i - 0] = arguments[_i];
+        r[_i] = arguments[_i];
     }
     return "";
 };
diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.js b/tests/baselines/reference/noImplicitAnyParametersInClass.js
index 0e247936529..4ad093f56be 100644
--- a/tests/baselines/reference/noImplicitAnyParametersInClass.js
+++ b/tests/baselines/reference/noImplicitAnyParametersInClass.js
@@ -107,7 +107,7 @@ var C = (function () {
         this.pub_f13 = function () {
             var r = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                r[_i - 0] = arguments[_i];
+                r[_i] = arguments[_i];
             }
             return "";
         };
@@ -131,7 +131,7 @@ var C = (function () {
         this.priv_f13 = function () {
             var r = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                r[_i - 0] = arguments[_i];
+                r[_i] = arguments[_i];
             }
             return "";
         };
@@ -158,7 +158,7 @@ var C = (function () {
     C.prototype.pub_f6 = function () {
         var r = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
+            r[_i] = arguments[_i];
         }
     };
     // Implicit-'any'/'any[]' errors for x, r.
@@ -184,7 +184,7 @@ var C = (function () {
     C.prototype.priv_f6 = function () {
         var r = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
+            r[_i] = arguments[_i];
         }
     };
     // Implicit-'any'/'any[]' errors for x, r.
diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.js b/tests/baselines/reference/noImplicitAnyParametersInModule.js
index e7f30205559..1866696fe34 100644
--- a/tests/baselines/reference/noImplicitAnyParametersInModule.js
+++ b/tests/baselines/reference/noImplicitAnyParametersInModule.js
@@ -63,7 +63,7 @@ var M;
     function m_f6() {
         var r = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
+            r[_i] = arguments[_i];
         }
     }
     // Implicit-'any'/'any[]' errors for x and r.
@@ -86,7 +86,7 @@ var M;
     var m_f13 = function () {
         var r = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
+            r[_i] = arguments[_i];
         }
         return "";
     };
diff --git a/tests/baselines/reference/nonArrayRestArgs.js b/tests/baselines/reference/nonArrayRestArgs.js
index d16b7dea346..813f7141b5c 100644
--- a/tests/baselines/reference/nonArrayRestArgs.js
+++ b/tests/baselines/reference/nonArrayRestArgs.js
@@ -8,7 +8,7 @@ function foo(...rest: number) { // error
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
     var x = rest[0];
     return x;
diff --git a/tests/baselines/reference/optionalBindingParametersInOverloads1.js b/tests/baselines/reference/optionalBindingParametersInOverloads1.js
index 3658efa72c6..9fd64d0da9e 100644
--- a/tests/baselines/reference/optionalBindingParametersInOverloads1.js
+++ b/tests/baselines/reference/optionalBindingParametersInOverloads1.js
@@ -13,7 +13,7 @@ foo([false, 0, ""]);
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 foo(["", 0, false]);
diff --git a/tests/baselines/reference/optionalBindingParametersInOverloads2.js b/tests/baselines/reference/optionalBindingParametersInOverloads2.js
index 1ddfdae4f07..033d81993f5 100644
--- a/tests/baselines/reference/optionalBindingParametersInOverloads2.js
+++ b/tests/baselines/reference/optionalBindingParametersInOverloads2.js
@@ -13,7 +13,7 @@ foo({ x: false, y: 0, z: "" });
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 foo({ x: "", y: 0, z: false });
diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
index 356cece5ab6..e83f33f3ad0 100644
--- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
+++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
@@ -24,7 +24,7 @@ var A = (function () {
 function Choice() {
     var v_args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        v_args[_i - 0] = arguments[_i];
+        v_args[_i] = arguments[_i];
     }
     return new A();
 }
diff --git a/tests/baselines/reference/parenthesizedContexualTyping2.js b/tests/baselines/reference/parenthesizedContexualTyping2.js
index 993a10ba49c..48b9355ca31 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping2.js
+++ b/tests/baselines/reference/parenthesizedContexualTyping2.js
@@ -45,7 +45,7 @@ var obj2: ObjType = ({ x: x => (x, undefined), y: y => (y, undefined) });
 function fun() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
     return undefined;
 }
diff --git a/tests/baselines/reference/parser509668.js b/tests/baselines/reference/parser509668.js
index c767aea676a..5dfdc7d1e31 100644
--- a/tests/baselines/reference/parser509668.js
+++ b/tests/baselines/reference/parser509668.js
@@ -10,7 +10,7 @@ var Foo3 = (function () {
     function Foo3() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
         this.args = args;
     }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration18.js b/tests/baselines/reference/parserMemberAccessorDeclaration18.js
index e25aa69f465..c6c902d4915 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration18.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration18.js
@@ -11,7 +11,7 @@ var C = (function () {
         set: function () {
             var a = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                a[_i - 0] = arguments[_i];
+                a[_i] = arguments[_i];
             }
         },
         enumerable: true,
diff --git a/tests/baselines/reference/parserParameterList10.js b/tests/baselines/reference/parserParameterList10.js
index 93ed8c60e8b..f899901728c 100644
--- a/tests/baselines/reference/parserParameterList10.js
+++ b/tests/baselines/reference/parserParameterList10.js
@@ -10,7 +10,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var bar = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            bar[_i - 0] = arguments[_i];
+            bar[_i] = arguments[_i];
         }
     };
     return C;
diff --git a/tests/baselines/reference/parserParameterList11.js b/tests/baselines/reference/parserParameterList11.js
index a56e8b58c20..c736e5fddb6 100644
--- a/tests/baselines/reference/parserParameterList11.js
+++ b/tests/baselines/reference/parserParameterList11.js
@@ -5,7 +5,7 @@
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 102;
 });
diff --git a/tests/baselines/reference/parserParameterList9.js b/tests/baselines/reference/parserParameterList9.js
index ec08b48f572..3ccc1d02025 100644
--- a/tests/baselines/reference/parserParameterList9.js
+++ b/tests/baselines/reference/parserParameterList9.js
@@ -10,7 +10,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var bar = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            bar[_i - 0] = arguments[_i];
+            bar[_i] = arguments[_i];
         }
     };
     return C;
diff --git a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
index d485fb11d7f..d20b35625e9 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
@@ -63,7 +63,7 @@ test(function (t1) { });
 test(function () {
     var ts = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        ts[_i - 0] = arguments[_i];
+        ts[_i] = arguments[_i];
     }
 });
 // source function has rest arg
diff --git a/tests/baselines/reference/restArgAssignmentCompat.js b/tests/baselines/reference/restArgAssignmentCompat.js
index 3f8749f332d..b679f56a881 100644
--- a/tests/baselines/reference/restArgAssignmentCompat.js
+++ b/tests/baselines/reference/restArgAssignmentCompat.js
@@ -13,7 +13,7 @@ n([4], 'foo');
 function f() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
     x.forEach(function (n, i) { return void ('item ' + i + ' = ' + n); });
 }
diff --git a/tests/baselines/reference/restArgMissingName.js b/tests/baselines/reference/restArgMissingName.js
index b87800c7dac..f4ec647f7e4 100644
--- a/tests/baselines/reference/restArgMissingName.js
+++ b/tests/baselines/reference/restArgMissingName.js
@@ -6,6 +6,6 @@ function sum (...) {}
 function sum() {
     var  = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        [_i - 0] = arguments[_i];
+        [_i] = arguments[_i];
     }
 }
diff --git a/tests/baselines/reference/restParamAsOptional.js b/tests/baselines/reference/restParamAsOptional.js
index eb224b84c33..2f6da684c0e 100644
--- a/tests/baselines/reference/restParamAsOptional.js
+++ b/tests/baselines/reference/restParamAsOptional.js
@@ -6,12 +6,12 @@ function f2(...x = []) { }
 function f() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 function f2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
diff --git a/tests/baselines/reference/restParamModifier2.js b/tests/baselines/reference/restParamModifier2.js
index a11b78a2376..e98aef3f9ad 100644
--- a/tests/baselines/reference/restParamModifier2.js
+++ b/tests/baselines/reference/restParamModifier2.js
@@ -8,7 +8,7 @@ var C = (function () {
     function C() {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
         this.rest = rest;
     }
diff --git a/tests/baselines/reference/restParameterAssignmentCompatibility.js b/tests/baselines/reference/restParameterAssignmentCompatibility.js
index 0821cf18277..01472c78c1e 100644
--- a/tests/baselines/reference/restParameterAssignmentCompatibility.js
+++ b/tests/baselines/reference/restParameterAssignmentCompatibility.js
@@ -33,7 +33,7 @@ var T = (function () {
     T.prototype.m = function () {
         var p3 = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            p3[_i - 0] = arguments[_i];
+            p3[_i] = arguments[_i];
         }
     };
     return T;
diff --git a/tests/baselines/reference/restParameterNoTypeAnnotation.js b/tests/baselines/reference/restParameterNoTypeAnnotation.js
index 95e092fdd43..b22b531675d 100644
--- a/tests/baselines/reference/restParameterNoTypeAnnotation.js
+++ b/tests/baselines/reference/restParameterNoTypeAnnotation.js
@@ -9,7 +9,7 @@ function foo(...rest) {
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
     var x = rest[0];
     return x;
diff --git a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
index c6b5fa2ae41..5c1db2c62e1 100644
--- a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
+++ b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
@@ -31,13 +31,13 @@ var b = {
 function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f2 = function () {
@@ -52,7 +52,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C;
@@ -62,7 +62,7 @@ var b = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -74,7 +74,7 @@ var b = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes.js b/tests/baselines/reference/restParametersOfNonArrayTypes.js
index 5400a8b43cc..67145167720 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes.js
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes.js
@@ -30,13 +30,13 @@ var b = {
 function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f2 = function () {
@@ -51,7 +51,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C;
@@ -61,7 +61,7 @@ var b = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -73,7 +73,7 @@ var b = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes2.js b/tests/baselines/reference/restParametersOfNonArrayTypes2.js
index d405c13db5a..7df2458a27b 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes2.js
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes2.js
@@ -62,13 +62,13 @@ var b2 = {
 function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f2 = function () {
@@ -83,7 +83,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C;
@@ -93,7 +93,7 @@ var b = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -105,20 +105,20 @@ var b = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
 function foo2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f3 = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f4 = function () {
@@ -133,7 +133,7 @@ var C2 = (function () {
     C2.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C2;
@@ -143,7 +143,7 @@ var b2 = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -155,7 +155,7 @@ var b2 = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
index 3f1cf33e7ba..1004fdfcbcb 100644
--- a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
+++ b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
@@ -57,13 +57,13 @@ var b2 = {
 function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f2 = function () {
@@ -78,7 +78,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C;
@@ -88,7 +88,7 @@ var b = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -100,20 +100,20 @@ var b = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
 function foo2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f3 = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f4 = function () {
@@ -128,7 +128,7 @@ var C2 = (function () {
     C2.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C2;
@@ -138,7 +138,7 @@ var b2 = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -150,7 +150,7 @@ var b2 = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/restParamsWithNonRestParams.js b/tests/baselines/reference/restParamsWithNonRestParams.js
index 6b0caa72394..7b16959143a 100644
--- a/tests/baselines/reference/restParamsWithNonRestParams.js
+++ b/tests/baselines/reference/restParamsWithNonRestParams.js
@@ -10,7 +10,7 @@ foo3(); // error but shouldn't be
 function foo() {
     var b = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        b[_i - 0] = arguments[_i];
+        b[_i] = arguments[_i];
     }
 }
 foo(); // ok
diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
index 78417b9a082..55ea1335771 100644
--- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
+++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
@@ -120,7 +120,7 @@ var C = (function () {
     C.prototype.concat = function () {
         var strings = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            strings[_i - 0] = arguments[_i];
+            strings[_i] = arguments[_i];
         }
         return null;
     };
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.js b/tests/baselines/reference/stringLiteralTypesOverloads03.js
index c1e79160880..4fdfd4f85d0 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloads03.js
+++ b/tests/baselines/reference/stringLiteralTypesOverloads03.js
@@ -52,7 +52,7 @@ var helloOrWorld;
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return undefined;
 }
@@ -62,7 +62,7 @@ var fResult3 = f(helloOrWorld);
 function g() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return undefined;
 }
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.js b/tests/baselines/reference/subtypingWithCallSignatures2.js
index 843a727c33e..3b5fada2012 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.js
@@ -253,14 +253,14 @@ var r9b = [r9arg2, r9arg1];
 var r10arg1 = function () {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
     return x[0];
 };
 var r10arg2 = function () {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
     return null;
 };
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.js b/tests/baselines/reference/subtypingWithCallSignatures3.js
index a9e7d01aab6..4ac7d3a7f24 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.js
@@ -170,14 +170,14 @@ var Errors;
     var r4arg = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
         return null;
     };
     var r4arg2 = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
         return null;
     };
diff --git a/tests/baselines/reference/taggedTemplateStringsHexadecimalEscapes.js b/tests/baselines/reference/taggedTemplateStringsHexadecimalEscapes.js
index e4482ded0c2..3df09abb2db 100644
--- a/tests/baselines/reference/taggedTemplateStringsHexadecimalEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsHexadecimalEscapes.js
@@ -8,7 +8,7 @@ f `\x0D${ "Interrupted CRLF" }\x0A`;
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 (_a = ["\r", "\n"], _a.raw = ["\\x0D", "\\x0A"], f(_a, "Interrupted CRLF"));
diff --git a/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js b/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
index 9450e939f2f..33c2914e3e8 100644
--- a/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
+++ b/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
@@ -11,7 +11,7 @@ f `0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r
 function f() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 (_a = ["0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r n"], _a.raw = ["0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r n"], f(_a));
diff --git a/tests/baselines/reference/taggedTemplateStringsWithMultilineTemplate.js b/tests/baselines/reference/taggedTemplateStringsWithMultilineTemplate.js
index cee9d1efce4..9ffc0cadfef 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithMultilineTemplate.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithMultilineTemplate.js
@@ -11,7 +11,7 @@ f `
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 (_a = ["\n\n"], _a.raw = ["\n\\\n\n"], f(_a));
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js
index 4245b0cb0f4..19211c2fa8a 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js
@@ -26,7 +26,7 @@ var z = foo `${1}${2}${3}`;  // any (with error)
 function foo() {
     var stuff = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        stuff[_i - 0] = arguments[_i];
+        stuff[_i] = arguments[_i];
     }
     return undefined;
 }
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js
index c16bfa5454f..fdac55da181 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js
@@ -22,7 +22,7 @@ var d = foo2([], 1);
 function foo1() {
     var stuff = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        stuff[_i - 0] = arguments[_i];
+        stuff[_i] = arguments[_i];
     }
     return undefined;
 }
@@ -31,7 +31,7 @@ var b = foo1([], 1);
 function foo2() {
     var stuff = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        stuff[_i - 0] = arguments[_i];
+        stuff[_i] = arguments[_i];
     }
     return undefined;
 }
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js
index f7523eb9870..334f61e453d 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js
@@ -10,7 +10,7 @@ foo `${function (x: number) { x = "bad"; } }`;
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 (_a = ["", ""], _a.raw = ["", ""], foo(_a, function (x) { x = "bad"; }));
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
index ae73b0b227e..6a04b082e1f 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
@@ -8,7 +8,7 @@ f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 (_a = ["'\uD83D\uDCA9'", "'\uD83D\uDCA9'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
diff --git a/tests/baselines/reference/taggedTemplateStringsWithWhitespaceEscapes.js b/tests/baselines/reference/taggedTemplateStringsWithWhitespaceEscapes.js
index 65af8da59f9..e8f219fd125 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithWhitespaceEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithWhitespaceEscapes.js
@@ -8,7 +8,7 @@ f `\t\n\v\f\r\\`;
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 (_a = ["\t\n\v\f\r\\"], _a.raw = ["\\t\\n\\v\\f\\r\\\\"], f(_a));
diff --git a/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.js b/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.js
index 6f30140c63e..495e9354024 100644
--- a/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.js
+++ b/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.js
@@ -35,7 +35,7 @@ f1(1);
 function f2() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 f2.apply(void 0, []);
diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js
index c07dd225396..74a609694aa 100644
--- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js
+++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js
@@ -122,7 +122,7 @@ function fun2(x, y) {
 function fun3() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return args[+randBool()];
 }
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.js b/tests/baselines/reference/typeGuardFunctionErrors.js
index 244b0df3333..99c25faaa88 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -264,7 +264,7 @@ C;
 function b4() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
     return true;
 }
diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js
index c9a43ab4ce6..88f5e3ab352 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -22,7 +22,7 @@ define(["require", "exports", "fs"], function (require, exports, fs) {
     function join() {
         var paths = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            paths[_i - 0] = arguments[_i];
+            paths[_i] = arguments[_i];
         }
     }
     function instrumentFile(covFileDir, covFileName, originalFilePath) {
diff --git a/tests/baselines/reference/unionTypeCallSignatures3.js b/tests/baselines/reference/unionTypeCallSignatures3.js
index 2dae152e474..b3c24a0e60a 100644
--- a/tests/baselines/reference/unionTypeCallSignatures3.js
+++ b/tests/baselines/reference/unionTypeCallSignatures3.js
@@ -18,7 +18,7 @@ function f2(s) { }
 function f3() {
     var s = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        s[_i - 0] = arguments[_i];
+        s[_i] = arguments[_i];
     }
 }
 function f4(s, s2) { }
diff --git a/tests/baselines/reference/unusedParametersWithUnderscore.js b/tests/baselines/reference/unusedParametersWithUnderscore.js
index 2899d347c66..02d5da33395 100644
--- a/tests/baselines/reference/unusedParametersWithUnderscore.js
+++ b/tests/baselines/reference/unusedParametersWithUnderscore.js
@@ -35,13 +35,13 @@ function f3(_c) {
 function f4() {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
 }
 function f5() {
     var _arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        _arg[_i - 0] = arguments[_i];
+        _arg[_i] = arguments[_i];
     }
 }
 function f6(arg, _arg) {
diff --git a/tests/baselines/reference/varArgConstructorMemberParameter.js b/tests/baselines/reference/varArgConstructorMemberParameter.js
index 2715ed9e542..0d80c2b4dbb 100644
--- a/tests/baselines/reference/varArgConstructorMemberParameter.js
+++ b/tests/baselines/reference/varArgConstructorMemberParameter.js
@@ -17,7 +17,7 @@ var Foo1 = (function () {
     function Foo1() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     }
     return Foo1;
@@ -32,7 +32,7 @@ var Foo3 = (function () {
     function Foo3() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
         this.args = args;
     }
diff --git a/tests/baselines/reference/varArgParamTypeCheck.js b/tests/baselines/reference/varArgParamTypeCheck.js
index c2a33416436..2807ca97058 100644
--- a/tests/baselines/reference/varArgParamTypeCheck.js
+++ b/tests/baselines/reference/varArgParamTypeCheck.js
@@ -25,7 +25,7 @@ sequence(
 function sequence() {
     var sequences = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        sequences[_i - 0] = arguments[_i];
+        sequences[_i] = arguments[_i];
     }
 }
 function callback(clb) {
diff --git a/tests/baselines/reference/varArgWithNoParamName.js b/tests/baselines/reference/varArgWithNoParamName.js
index 05a9695770a..3aa9fcbabb0 100644
--- a/tests/baselines/reference/varArgWithNoParamName.js
+++ b/tests/baselines/reference/varArgWithNoParamName.js
@@ -5,6 +5,6 @@ function t1(...) {}
 function t1() {
     var  = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        [_i - 0] = arguments[_i];
+        [_i] = arguments[_i];
     }
 }
diff --git a/tests/baselines/reference/vararg.js b/tests/baselines/reference/vararg.js
index 015c8c9957a..bd4a79b4626 100644
--- a/tests/baselines/reference/vararg.js
+++ b/tests/baselines/reference/vararg.js
@@ -65,7 +65,7 @@ var M;
         C.prototype.fonly = function () {
             var rest = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                rest[_i - 0] = arguments[_i];
+                rest[_i] = arguments[_i];
             }
             builder = "";
             for (var i = 0; i < rest.length; i++) {

From a2b13d05f2bb3e6111d9dfe923bfd3329068ef6b Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Thu, 17 Nov 2016 15:12:32 -0800
Subject: [PATCH 3/3] pass project name as a constructor parameter (#12333)

---
 .../unittests/tsserverProjectSystem.ts        |  2 +
 src/server/editorServices.ts                  | 12 ++--
 src/server/project.ts                         | 59 +++++++++----------
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 32a78a07811..ce5bec05b56 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1614,6 +1614,7 @@ namespace ts.projectSystem {
                     return;
                 }
                 assert.equal(e.eventName, server.ProjectLanguageServiceStateEvent);
+                assert.equal(e.data.project.getProjectName(), config.path, "project name");
                 lastEvent = <server.ProjectLanguageServiceStateEvent>e;
             });
             session.executeCommand(<protocol.OpenRequest>{
@@ -1628,6 +1629,7 @@ namespace ts.projectSystem {
             assert.isFalse(project.languageServiceEnabled, "Language service enabled");
             assert.isTrue(!!lastEvent, "should receive event");
             assert.equal(lastEvent.data.project, project, "project name");
+            assert.equal(lastEvent.data.project.getProjectName(), config.path, "config path");
             assert.isFalse(lastEvent.data.languageServiceEnabled, "Language service state");
 
             host.reloadFS([f1, f2, configWithExclude]);
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index f69b5c11547..6a7cb049296 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -470,7 +470,7 @@ namespace ts.server {
 
         private onTypeRootFileChanged(project: ConfiguredProject, fileName: string) {
             this.logger.info(`Type root file ${fileName} changed`);
-            this.throttledOperations.schedule(project.configFileName + " * type root", /*delay*/ 250, () => {
+            this.throttledOperations.schedule(project.getConfigFilePath() + " * type root", /*delay*/ 250, () => {
                 project.updateTypes();
                 this.updateConfiguredProject(project); // TODO: Figure out why this is needed (should be redundant?)
                 this.refreshInferredProjects();
@@ -492,13 +492,13 @@ namespace ts.server {
 
             this.logger.info(`Detected source file changes: ${fileName}`);
             this.throttledOperations.schedule(
-                project.configFileName,
+                project.getConfigFilePath(),
                 /*delay*/250,
                 () => this.handleChangeInSourceFileForConfiguredProject(project, fileName));
         }
 
         private handleChangeInSourceFileForConfiguredProject(project: ConfiguredProject, triggerFile: string) {
-            const { projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.configFileName);
+            const { projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.getConfigFilePath());
             this.reportConfigFileDiagnostics(project.getProjectName(), configFileErrors, triggerFile);
 
             const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f)));
@@ -520,7 +520,7 @@ namespace ts.server {
         }
 
         private onConfigChangedForConfiguredProject(project: ConfiguredProject) {
-            this.logger.info(`Config file changed: ${project.configFileName}`);
+            this.logger.info(`Config file changed: ${project.getConfigFilePath()}`);
             this.updateConfiguredProject(project);
             this.refreshInferredProjects();
         }
@@ -1009,13 +1009,13 @@ namespace ts.server {
         }
 
         private updateConfiguredProject(project: ConfiguredProject) {
-            if (!this.host.fileExists(project.configFileName)) {
+            if (!this.host.fileExists(project.getConfigFilePath())) {
                 this.logger.info("Config file deleted");
                 this.removeProject(project);
                 return;
             }
 
-            const { success, projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.configFileName);
+            const { success, projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.getConfigFilePath());
             if (!success) {
                 // reset project settings to default
                 this.updateNonInferredProject(project, [], fileNamePropertyReader, {}, {}, /*compileOnSave*/false, configFileErrors);
diff --git a/src/server/project.ts b/src/server/project.ts
index 3e5c810e805..82ecc6f3644 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -229,6 +229,7 @@ namespace ts.server {
         }
 
         constructor(
+            private readonly projectName: string,
             readonly projectKind: ProjectKind,
             readonly projectService: ProjectService,
             private documentRegistry: ts.DocumentRegistry,
@@ -307,7 +308,9 @@ namespace ts.server {
             this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ false);
         }
 
-        abstract getProjectName(): string;
+        getProjectName() {
+            return this.projectName;
+        }
         abstract getProjectRootPath(): string | undefined;
         abstract getTypingOptions(): TypingOptions;
 
@@ -759,31 +762,27 @@ namespace ts.server {
 
     export class InferredProject extends Project {
 
-        private static NextId = 1;
-
-        /**
-         * Unique name that identifies this particular inferred project
-         */
-        private readonly inferredProjectName: string;
+        private static newName = (() => {
+            let nextId = 1;
+            return () => {
+                const id = nextId;
+                nextId++;
+                return makeInferredProjectName(id);
+            }
+        })();
 
         // Used to keep track of what directories are watched for this project
         directoriesWatchedForTsconfig: string[] = [];
 
         constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, compilerOptions: CompilerOptions) {
-            super(ProjectKind.Inferred,
+            super(InferredProject.newName(),
+                ProjectKind.Inferred,
                 projectService,
                 documentRegistry,
                 /*files*/ undefined,
                 /*languageServiceEnabled*/ true,
                 compilerOptions,
                 /*compileOnSaveEnabled*/ false);
-
-            this.inferredProjectName = makeInferredProjectName(InferredProject.NextId);
-            InferredProject.NextId++;
-        }
-
-        getProjectName() {
-            return this.inferredProjectName;
         }
 
         getProjectRootPath() {
@@ -822,7 +821,7 @@ namespace ts.server {
         /** Used for configured projects which may have multiple open roots */
         openRefCount = 0;
 
-        constructor(readonly configFileName: NormalizedPath,
+        constructor(configFileName: NormalizedPath,
             projectService: ProjectService,
             documentRegistry: ts.DocumentRegistry,
             hasExplicitListOfFiles: boolean,
@@ -830,11 +829,15 @@ namespace ts.server {
             private wildcardDirectories: Map<WatchDirectoryFlags>,
             languageServiceEnabled: boolean,
             public compileOnSaveEnabled: boolean) {
-            super(ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
+            super(configFileName, ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
+        }
+
+        getConfigFilePath() {
+            return this.getProjectName();
         }
 
         getProjectRootPath() {
-            return getDirectoryPath(this.configFileName);
+            return getDirectoryPath(this.getConfigFilePath());
         }
 
         setProjectErrors(projectErrors: Diagnostic[]) {
@@ -849,12 +852,8 @@ namespace ts.server {
             return this.typingOptions;
         }
 
-        getProjectName() {
-            return this.configFileName;
-        }
-
         watchConfigFile(callback: (project: ConfiguredProject) => void) {
-            this.projectFileWatcher = this.projectService.host.watchFile(this.configFileName, _ => callback(this));
+            this.projectFileWatcher = this.projectService.host.watchFile(this.getConfigFilePath(), _ => callback(this));
         }
 
         watchTypeRoots(callback: (project: ConfiguredProject, path: string) => void) {
@@ -872,7 +871,7 @@ namespace ts.server {
                 return;
             }
 
-            const directoryToWatch = getDirectoryPath(this.configFileName);
+            const directoryToWatch = getDirectoryPath(this.getConfigFilePath());
             this.projectService.logger.info(`Add recursive watcher for: ${directoryToWatch}`);
             this.directoryWatcher = this.projectService.host.watchDirectory(directoryToWatch, path => callback(this, path), /*recursive*/ true);
         }
@@ -881,7 +880,7 @@ namespace ts.server {
             if (!this.wildcardDirectories) {
                 return;
             }
-            const configDirectoryPath = getDirectoryPath(this.configFileName);
+            const configDirectoryPath = getDirectoryPath(this.getConfigFilePath());
             this.directoriesWatchedForWildcards = reduceProperties(this.wildcardDirectories, (watchers, flag, directory) => {
                 if (comparePaths(configDirectoryPath, directory, ".", !this.projectService.host.useCaseSensitiveFileNames) !== Comparison.EqualTo) {
                     const recursive = (flag & WatchDirectoryFlags.Recursive) !== 0;
@@ -941,14 +940,14 @@ namespace ts.server {
 
     export class ExternalProject extends Project {
         private typingOptions: TypingOptions;
-        constructor(readonly externalProjectName: string,
+        constructor(externalProjectName: string,
             projectService: ProjectService,
             documentRegistry: ts.DocumentRegistry,
             compilerOptions: CompilerOptions,
             languageServiceEnabled: boolean,
             public compileOnSaveEnabled: boolean,
             private readonly projectFilePath?: string) {
-            super(ProjectKind.External, projectService, documentRegistry, /*hasExplicitListOfFiles*/ true, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
+            super(externalProjectName, ProjectKind.External, projectService, documentRegistry, /*hasExplicitListOfFiles*/ true, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
         }
 
         getProjectRootPath() {
@@ -958,7 +957,7 @@ namespace ts.server {
             // if the projectFilePath is not given, we make the assumption that the project name
             // is the path of the project file. AS the project name is provided by VS, we need to
             // normalize slashes before using it as a file name.
-            return getDirectoryPath(normalizeSlashes(this.externalProjectName));
+            return getDirectoryPath(normalizeSlashes(this.getProjectName()));
         }
 
         getTypingOptions() {
@@ -992,9 +991,5 @@ namespace ts.server {
             }
             this.typingOptions = newTypingOptions;
         }
-
-        getProjectName() {
-            return this.externalProjectName;
-        }
     }
 }
\ No newline at end of file