From 7c22e50269fb965568053e4cbf438f017eb90a27 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 6 Jun 2017 14:11:11 -0700
Subject: [PATCH] update existing tests

---
 tests/cases/fourslash/unusedClassInNamespace1.ts          | 2 +-
 tests/cases/fourslash/unusedClassInNamespace2.ts          | 2 +-
 tests/cases/fourslash/unusedClassInNamespace3.ts          | 2 +-
 tests/cases/fourslash/unusedClassInNamespace4.ts          | 2 +-
 tests/cases/fourslash/unusedConstantInFunction1.ts        | 2 +-
 tests/cases/fourslash/unusedEnumInFunction1.ts            | 2 +-
 tests/cases/fourslash/unusedEnumInNamespace1.ts           | 2 +-
 tests/cases/fourslash/unusedFunctionInNamespace1.ts       | 2 +-
 tests/cases/fourslash/unusedFunctionInNamespace2.ts       | 2 +-
 tests/cases/fourslash/unusedFunctionInNamespace3.ts       | 2 +-
 tests/cases/fourslash/unusedFunctionInNamespace4.ts       | 2 +-
 tests/cases/fourslash/unusedFunctionInNamespace5.ts       | 2 +-
 tests/cases/fourslash/unusedImports10FS.ts                | 2 +-
 tests/cases/fourslash/unusedImports11FS.ts                | 2 +-
 tests/cases/fourslash/unusedImports12FS.ts                | 2 +-
 tests/cases/fourslash/unusedImports1FS.ts                 | 2 +-
 tests/cases/fourslash/unusedImports2FS.ts                 | 2 +-
 tests/cases/fourslash/unusedImports3FS.ts                 | 2 +-
 tests/cases/fourslash/unusedImports4FS.ts                 | 2 +-
 tests/cases/fourslash/unusedImports5FS.ts                 | 2 +-
 tests/cases/fourslash/unusedImports6FS.ts                 | 2 +-
 tests/cases/fourslash/unusedImports7FS.ts                 | 2 +-
 tests/cases/fourslash/unusedImports8FS.ts                 | 2 +-
 tests/cases/fourslash/unusedImports9FS.ts                 | 2 +-
 tests/cases/fourslash/unusedInterfaceInNamespace1.ts      | 2 +-
 tests/cases/fourslash/unusedInterfaceInNamespace2.ts      | 2 +-
 tests/cases/fourslash/unusedLocalsInFunction1.ts          | 2 +-
 tests/cases/fourslash/unusedLocalsInFunction2.ts          | 2 +-
 tests/cases/fourslash/unusedLocalsInFunction3.ts          | 2 +-
 tests/cases/fourslash/unusedLocalsInFunction4.ts          | 2 +-
 tests/cases/fourslash/unusedLocalsInMethodFS1.ts          | 2 +-
 tests/cases/fourslash/unusedLocalsInMethodFS2.ts          | 2 +-
 tests/cases/fourslash/unusedLocalsinConstructorFS1.ts     | 2 +-
 tests/cases/fourslash/unusedLocalsinConstructorFS2.ts     | 2 +-
 tests/cases/fourslash/unusedMethodInClass1.ts             | 2 +-
 tests/cases/fourslash/unusedMethodInClass2.ts             | 2 +-
 tests/cases/fourslash/unusedMethodInClass3.ts             | 2 +-
 tests/cases/fourslash/unusedMethodInClass4.ts             | 2 +-
 tests/cases/fourslash/unusedMethodInClass5.ts             | 2 +-
 tests/cases/fourslash/unusedMethodInClass6.ts             | 2 +-
 tests/cases/fourslash/unusedNamespaceInNamespace.ts       | 2 +-
 tests/cases/fourslash/unusedParameterInConstructor1.ts    | 2 +-
 tests/cases/fourslash/unusedParameterInConstructor2.ts    | 2 +-
 tests/cases/fourslash/unusedParameterInConstructor3.ts    | 2 +-
 tests/cases/fourslash/unusedParameterInConstructor4.ts    | 2 +-
 tests/cases/fourslash/unusedParameterInFunction1.ts       | 2 +-
 tests/cases/fourslash/unusedParameterInFunction2.ts       | 2 +-
 tests/cases/fourslash/unusedParameterInFunction3.ts       | 2 +-
 tests/cases/fourslash/unusedParameterInFunction4.ts       | 2 +-
 tests/cases/fourslash/unusedParameterInLambda1.ts         | 2 +-
 tests/cases/fourslash/unusedTypeAliasInNamespace1.ts      | 2 +-
 tests/cases/fourslash/unusedTypeParametersInClass1.ts     | 2 +-
 tests/cases/fourslash/unusedTypeParametersInClass2.ts     | 2 +-
 tests/cases/fourslash/unusedTypeParametersInClass3.ts     | 2 +-
 tests/cases/fourslash/unusedTypeParametersInFunction1.ts  | 2 +-
 tests/cases/fourslash/unusedTypeParametersInFunction2.ts  | 2 +-
 tests/cases/fourslash/unusedTypeParametersInFunction3.ts  | 2 +-
 tests/cases/fourslash/unusedTypeParametersInInterface1.ts | 2 +-
 tests/cases/fourslash/unusedTypeParametersInLambda1.ts    | 2 +-
 tests/cases/fourslash/unusedTypeParametersInLambda2.ts    | 2 +-
 tests/cases/fourslash/unusedTypeParametersInLambda3.ts    | 2 +-
 tests/cases/fourslash/unusedTypeParametersInLambda4.ts    | 2 +-
 tests/cases/fourslash/unusedTypeParametersInMethod1.ts    | 2 +-
 tests/cases/fourslash/unusedTypeParametersInMethod2.ts    | 2 +-
 tests/cases/fourslash/unusedTypeParametersInMethods1.ts   | 2 +-
 tests/cases/fourslash/unusedVariableInBlocks.ts           | 2 +-
 tests/cases/fourslash/unusedVariableInClass1.ts           | 2 +-
 tests/cases/fourslash/unusedVariableInClass2.ts           | 2 +-
 tests/cases/fourslash/unusedVariableInClass3.ts           | 2 +-
 tests/cases/fourslash/unusedVariableInForLoop1FS.ts       | 2 +-
 tests/cases/fourslash/unusedVariableInForLoop2FS.ts       | 2 +-
 tests/cases/fourslash/unusedVariableInForLoop3FS.ts       | 2 +-
 tests/cases/fourslash/unusedVariableInForLoop4FS.ts       | 2 +-
 tests/cases/fourslash/unusedVariableInForLoop5FS.ts       | 5 ++---
 tests/cases/fourslash/unusedVariableInForLoop6FS.ts       | 2 +-
 tests/cases/fourslash/unusedVariableInForLoop7FS.ts       | 2 +-
 tests/cases/fourslash/unusedVariableInModule1.ts          | 2 +-
 tests/cases/fourslash/unusedVariableInModule2.ts          | 2 +-
 tests/cases/fourslash/unusedVariableInModule3.ts          | 2 +-
 tests/cases/fourslash/unusedVariableInModule4.ts          | 2 +-
 tests/cases/fourslash/unusedVariableInNamespace1.ts       | 2 +-
 tests/cases/fourslash/unusedVariableInNamespace2.ts       | 2 +-
 tests/cases/fourslash/unusedVariableInNamespace3.ts       | 2 +-
 83 files changed, 84 insertions(+), 85 deletions(-)

diff --git a/tests/cases/fourslash/unusedClassInNamespace1.ts b/tests/cases/fourslash/unusedClassInNamespace1.ts
index e13c889d327..6b70adffb7c 100644
--- a/tests/cases/fourslash/unusedClassInNamespace1.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace1.ts
@@ -7,4 +7,4 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`namespace greeter {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedClassInNamespace2.ts b/tests/cases/fourslash/unusedClassInNamespace2.ts
index 0b6b7504633..54de4886bbd 100644
--- a/tests/cases/fourslash/unusedClassInNamespace2.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace2.ts
@@ -11,5 +11,5 @@
 verify.rangeAfterCodeFix(`namespace greeter {
     export class class2 {
     }
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
 
diff --git a/tests/cases/fourslash/unusedClassInNamespace3.ts b/tests/cases/fourslash/unusedClassInNamespace3.ts
index 95e691d3ee1..7f4b00fc3b8 100644
--- a/tests/cases/fourslash/unusedClassInNamespace3.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace3.ts
@@ -22,4 +22,4 @@ verify.rangeAfterCodeFix(`namespace Validation {
 
     export class c2 {
     }
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedClassInNamespace4.ts b/tests/cases/fourslash/unusedClassInNamespace4.ts
index 8b856379acb..ab7cd44cc42 100644
--- a/tests/cases/fourslash/unusedClassInNamespace4.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace4.ts
@@ -24,4 +24,4 @@ verify.rangeAfterCodeFix(`namespace Validation {
     export class c2 {
 
     }
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedConstantInFunction1.ts b/tests/cases/fourslash/unusedConstantInFunction1.ts
index b0fe913e722..14868d34f65 100644
--- a/tests/cases/fourslash/unusedConstantInFunction1.ts
+++ b/tests/cases/fourslash/unusedConstantInFunction1.ts
@@ -6,5 +6,5 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`function f1 () {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
 
diff --git a/tests/cases/fourslash/unusedEnumInFunction1.ts b/tests/cases/fourslash/unusedEnumInFunction1.ts
index ae72b7b3da6..84f03ef488e 100644
--- a/tests/cases/fourslash/unusedEnumInFunction1.ts
+++ b/tests/cases/fourslash/unusedEnumInFunction1.ts
@@ -7,5 +7,5 @@
 
 verify.rangeAfterCodeFix(`function f1 () {
 }
-`);
+`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
 
diff --git a/tests/cases/fourslash/unusedEnumInNamespace1.ts b/tests/cases/fourslash/unusedEnumInNamespace1.ts
index e856a084bfe..1f2998c466e 100644
--- a/tests/cases/fourslash/unusedEnumInNamespace1.ts
+++ b/tests/cases/fourslash/unusedEnumInNamespace1.ts
@@ -8,4 +8,4 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`namespace greeter {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace1.ts b/tests/cases/fourslash/unusedFunctionInNamespace1.ts
index 7a63ff13caa..fe394fbccd1 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace1.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace1.ts
@@ -8,4 +8,4 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`namespace greeter {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace2.ts b/tests/cases/fourslash/unusedFunctionInNamespace2.ts
index 5a2ac44d3d0..d32e9848772 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace2.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace2.ts
@@ -11,4 +11,4 @@
 verify.rangeAfterCodeFix(`namespace greeter {
     export function function2() {
     }
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace3.ts b/tests/cases/fourslash/unusedFunctionInNamespace3.ts
index 69df15cb3c7..1d8b5e74376 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace3.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace3.ts
@@ -9,4 +9,4 @@
 ////} |]
 
 verify.rangeAfterCodeFix(`namespace Validation {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace4.ts b/tests/cases/fourslash/unusedFunctionInNamespace4.ts
index 36ceb319ff9..f59169ed729 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace4.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace4.ts
@@ -8,4 +8,4 @@
 ////} |]
 
 verify.rangeAfterCodeFix(`namespace Validation {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace5.ts b/tests/cases/fourslash/unusedFunctionInNamespace5.ts
index 3c2f20ce082..85c638aaa43 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace5.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace5.ts
@@ -25,4 +25,4 @@ verify.rangeAfterCodeFix(`function function3() {
         function1();
     }
 
-    export let a = function3;`);
+    export let a = function3;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedImports10FS.ts b/tests/cases/fourslash/unusedImports10FS.ts
index ea016b73cc2..9c12c576329 100644
--- a/tests/cases/fourslash/unusedImports10FS.ts
+++ b/tests/cases/fourslash/unusedImports10FS.ts
@@ -12,5 +12,5 @@
 ////     [|import a = A;|]
 //// }
 
-verify.rangeAfterCodeFix("");
+verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
 
diff --git a/tests/cases/fourslash/unusedImports11FS.ts b/tests/cases/fourslash/unusedImports11FS.ts
index c29b5612e88..9747279d4db 100644
--- a/tests/cases/fourslash/unusedImports11FS.ts
+++ b/tests/cases/fourslash/unusedImports11FS.ts
@@ -11,4 +11,4 @@
 //// export function f2(s: string){};
 //// export default f1;
 
-verify.rangeAfterCodeFix('import * as s from "./file1";');
\ No newline at end of file
+verify.rangeAfterCodeFix('import * as s from "./file1";', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports12FS.ts b/tests/cases/fourslash/unusedImports12FS.ts
index d86bc98c6cf..54e12bf2f18 100644
--- a/tests/cases/fourslash/unusedImports12FS.ts
+++ b/tests/cases/fourslash/unusedImports12FS.ts
@@ -10,4 +10,4 @@
 //// export function f2(s: string){};
 //// export default f1;
 
-verify.rangeAfterCodeFix('import f1 from "./file1";');
\ No newline at end of file
+verify.rangeAfterCodeFix('import f1 from "./file1";', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports1FS.ts b/tests/cases/fourslash/unusedImports1FS.ts
index 0fc2d36aac7..4c02cabc4ba 100644
--- a/tests/cases/fourslash/unusedImports1FS.ts
+++ b/tests/cases/fourslash/unusedImports1FS.ts
@@ -9,4 +9,4 @@
 ////
 ////    }
 
-verify.rangeAfterCodeFix('');
+verify.rangeAfterCodeFix('', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedImports2FS.ts b/tests/cases/fourslash/unusedImports2FS.ts
index 8865dea56a6..5dff4dc9237 100644
--- a/tests/cases/fourslash/unusedImports2FS.ts
+++ b/tests/cases/fourslash/unusedImports2FS.ts
@@ -16,4 +16,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {Calculator} from "./file1"`, /*includeWhiteSpace*/ true, /*errorCode*/ undefined);
+verify.rangeAfterCodeFix(`import {Calculator} from "./file1"`, /*includeWhiteSpace*/ true, /*errorCode*/ 0, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedImports3FS.ts b/tests/cases/fourslash/unusedImports3FS.ts
index 6926f97bb4f..9cc53839f17 100644
--- a/tests/cases/fourslash/unusedImports3FS.ts
+++ b/tests/cases/fourslash/unusedImports3FS.ts
@@ -20,5 +20,5 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {/*some comments*/ test, test2} from "./file1"`);
+verify.rangeAfterCodeFix(`import {/*some comments*/ test, test2} from "./file1"`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
 
diff --git a/tests/cases/fourslash/unusedImports4FS.ts b/tests/cases/fourslash/unusedImports4FS.ts
index 4f7e8882429..a923bd389c9 100644
--- a/tests/cases/fourslash/unusedImports4FS.ts
+++ b/tests/cases/fourslash/unusedImports4FS.ts
@@ -21,4 +21,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {Calculator, test2} from "./file1"`);
\ No newline at end of file
+verify.rangeAfterCodeFix(`import {Calculator, test2} from "./file1"`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports5FS.ts b/tests/cases/fourslash/unusedImports5FS.ts
index 15262df01fd..11def13df4d 100644
--- a/tests/cases/fourslash/unusedImports5FS.ts
+++ b/tests/cases/fourslash/unusedImports5FS.ts
@@ -21,4 +21,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {Calculator, test} from "./file1"`);
\ No newline at end of file
+verify.rangeAfterCodeFix(`import {Calculator, test} from "./file1"`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports6FS.ts b/tests/cases/fourslash/unusedImports6FS.ts
index 1d6a9a3232e..36ef2813ee0 100644
--- a/tests/cases/fourslash/unusedImports6FS.ts
+++ b/tests/cases/fourslash/unusedImports6FS.ts
@@ -17,4 +17,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix('');
\ No newline at end of file
+verify.rangeAfterCodeFix('', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports7FS.ts b/tests/cases/fourslash/unusedImports7FS.ts
index 1a23ea85925..bacca3a06a8 100644
--- a/tests/cases/fourslash/unusedImports7FS.ts
+++ b/tests/cases/fourslash/unusedImports7FS.ts
@@ -13,4 +13,4 @@
 //// export default function test2() {
 //// }
 
-verify.rangeAfterCodeFix('');
\ No newline at end of file
+verify.rangeAfterCodeFix('', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports8FS.ts b/tests/cases/fourslash/unusedImports8FS.ts
index 81bdeda36ac..3b01b54a342 100644
--- a/tests/cases/fourslash/unusedImports8FS.ts
+++ b/tests/cases/fourslash/unusedImports8FS.ts
@@ -21,4 +21,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {Calculator as calc, test as t1} from "./file1"`);
\ No newline at end of file
+verify.rangeAfterCodeFix(`import {Calculator as calc, test as t1} from "./file1"`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports9FS.ts b/tests/cases/fourslash/unusedImports9FS.ts
index f81f9a9f5ae..bea5517574d 100644
--- a/tests/cases/fourslash/unusedImports9FS.ts
+++ b/tests/cases/fourslash/unusedImports9FS.ts
@@ -17,4 +17,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix("");
\ No newline at end of file
+verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedInterfaceInNamespace1.ts b/tests/cases/fourslash/unusedInterfaceInNamespace1.ts
index f979069690b..b9410f41a58 100644
--- a/tests/cases/fourslash/unusedInterfaceInNamespace1.ts
+++ b/tests/cases/fourslash/unusedInterfaceInNamespace1.ts
@@ -8,4 +8,4 @@
 
 verify.rangeAfterCodeFix(`
 namespace greeter {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedInterfaceInNamespace2.ts b/tests/cases/fourslash/unusedInterfaceInNamespace2.ts
index 7737f9ce247..0155b851f93 100644
--- a/tests/cases/fourslash/unusedInterfaceInNamespace2.ts
+++ b/tests/cases/fourslash/unusedInterfaceInNamespace2.ts
@@ -9,4 +9,4 @@
 ////}
 
 verify.rangeAfterCodeFix(`export interface interface2 {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction1.ts b/tests/cases/fourslash/unusedLocalsInFunction1.ts
index e74f5dbd962..cf165184671 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction1.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction1.ts
@@ -7,4 +7,4 @@
 
 verify.rangeAfterCodeFix(`
 function greeter() {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction2.ts b/tests/cases/fourslash/unusedLocalsInFunction2.ts
index 83816e68038..2da97abea20 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction2.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction2.ts
@@ -6,4 +6,4 @@
 ////    x+1;
 ////}
 
-verify.rangeAfterCodeFix("var x;");
+verify.rangeAfterCodeFix("var x;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction3.ts b/tests/cases/fourslash/unusedLocalsInFunction3.ts
index 0164873acd8..ba3f73b5bd0 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction3.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction3.ts
@@ -7,4 +7,4 @@
 ////    z+1;
 ////}
 
-verify.rangeAfterCodeFix("var x,z = 1;", /*includeWhiteSpace*/ undefined, 6133);
+verify.rangeAfterCodeFix("var x,z = 1;", /*includeWhiteSpace*/ undefined, /*errorCode*/ 6133, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction4.ts b/tests/cases/fourslash/unusedLocalsInFunction4.ts
index a458d6d824c..62cbf589d76 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction4.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction4.ts
@@ -7,4 +7,4 @@
 ////    z++;
 ////}
 
-verify.rangeAfterCodeFix("var y = 0,z = 1;");
+verify.rangeAfterCodeFix("var y = 0,z = 1;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedLocalsInMethodFS1.ts b/tests/cases/fourslash/unusedLocalsInMethodFS1.ts
index dc73ab86663..8ed3e080143 100644
--- a/tests/cases/fourslash/unusedLocalsInMethodFS1.ts
+++ b/tests/cases/fourslash/unusedLocalsInMethodFS1.ts
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangeAfterCodeFix("var y = 10;");
+verify.rangeAfterCodeFix("var y = 10;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedLocalsInMethodFS2.ts b/tests/cases/fourslash/unusedLocalsInMethodFS2.ts
index 012bf87a222..9104ba3973a 100644
--- a/tests/cases/fourslash/unusedLocalsInMethodFS2.ts
+++ b/tests/cases/fourslash/unusedLocalsInMethodFS2.ts
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangeAfterCodeFix("var  y;");
+verify.rangeAfterCodeFix("var  y;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts b/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
index 4ed58d3142d..c091562f8a4 100644
--- a/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
+++ b/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
@@ -9,4 +9,4 @@
 ////}
 
 verify.rangeAfterCodeFix(`constructor() {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts b/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
index eeaf66050d4..764f380e49b 100644
--- a/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
+++ b/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
@@ -15,4 +15,4 @@ verify.rangeAfterCodeFix(`
         var used = "dummy";
         used = used + "second part";
     }
-`);
\ No newline at end of file
+`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedMethodInClass1.ts b/tests/cases/fourslash/unusedMethodInClass1.ts
index a5e3789c8af..43cc2d192c2 100644
--- a/tests/cases/fourslash/unusedMethodInClass1.ts
+++ b/tests/cases/fourslash/unusedMethodInClass1.ts
@@ -8,4 +8,4 @@
 
 verify.rangeAfterCodeFix(`
 class greeter {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedMethodInClass2.ts b/tests/cases/fourslash/unusedMethodInClass2.ts
index cce621236d4..51db9367deb 100644
--- a/tests/cases/fourslash/unusedMethodInClass2.ts
+++ b/tests/cases/fourslash/unusedMethodInClass2.ts
@@ -12,4 +12,4 @@ verify.rangeAfterCodeFix(`
 class greeter {
     public function2() {
     }
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedMethodInClass3.ts b/tests/cases/fourslash/unusedMethodInClass3.ts
index ccf98c4bbc5..f07f0f4a892 100644
--- a/tests/cases/fourslash/unusedMethodInClass3.ts
+++ b/tests/cases/fourslash/unusedMethodInClass3.ts
@@ -8,4 +8,4 @@
 
 verify.rangeAfterCodeFix(`
 class greeter {
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedMethodInClass4.ts b/tests/cases/fourslash/unusedMethodInClass4.ts
index 962b80f5bc1..19ad173e76b 100644
--- a/tests/cases/fourslash/unusedMethodInClass4.ts
+++ b/tests/cases/fourslash/unusedMethodInClass4.ts
@@ -9,4 +9,4 @@
 ////}
 
 verify.rangeAfterCodeFix(`public function2(){
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedMethodInClass5.ts b/tests/cases/fourslash/unusedMethodInClass5.ts
index 806e619817f..ac27874bafe 100644
--- a/tests/cases/fourslash/unusedMethodInClass5.ts
+++ b/tests/cases/fourslash/unusedMethodInClass5.ts
@@ -5,4 +5,4 @@
 ////     private ["string"] (){} 
 //// }|]
 
-verify.rangeAfterCodeFix("class C { }");
\ No newline at end of file
+verify.rangeAfterCodeFix("class C { }", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedMethodInClass6.ts b/tests/cases/fourslash/unusedMethodInClass6.ts
index d223b3d6857..b8c65c56fa1 100644
--- a/tests/cases/fourslash/unusedMethodInClass6.ts
+++ b/tests/cases/fourslash/unusedMethodInClass6.ts
@@ -5,4 +5,4 @@
 ////     private "string" (){} 
 //// }|]
 
-verify.rangeAfterCodeFix("class C { }");
\ No newline at end of file
+verify.rangeAfterCodeFix("class C { }", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedNamespaceInNamespace.ts b/tests/cases/fourslash/unusedNamespaceInNamespace.ts
index 802336454c6..5f1892e1a2f 100644
--- a/tests/cases/fourslash/unusedNamespaceInNamespace.ts
+++ b/tests/cases/fourslash/unusedNamespaceInNamespace.ts
@@ -9,5 +9,5 @@
 verify.rangeAfterCodeFix(`
 namespace A {
 }
-`);
+`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
 
diff --git a/tests/cases/fourslash/unusedParameterInConstructor1.ts b/tests/cases/fourslash/unusedParameterInConstructor1.ts
index 36539e6649b..33fe34c7e61 100644
--- a/tests/cases/fourslash/unusedParameterInConstructor1.ts
+++ b/tests/cases/fourslash/unusedParameterInConstructor1.ts
@@ -5,4 +5,4 @@
 ////    [|constructor(private p1: string, public p2: boolean, public p3: any, p5)|] { p5; }
 //// }
 
-verify.rangeAfterCodeFix("constructor(public p2: boolean, public p3: any, p5)");
\ No newline at end of file
+verify.rangeAfterCodeFix("constructor(public p2: boolean, public p3: any, p5)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInConstructor2.ts b/tests/cases/fourslash/unusedParameterInConstructor2.ts
index e822a2f248d..71595a9c81c 100644
--- a/tests/cases/fourslash/unusedParameterInConstructor2.ts
+++ b/tests/cases/fourslash/unusedParameterInConstructor2.ts
@@ -5,4 +5,4 @@
 ////    [|constructor(public p1: string, private p2: boolean, public p3: any, p5)|] { p5; }
 //// }
 
-verify.rangeAfterCodeFix("constructor(public p1: string, public p3: any, p5)");
\ No newline at end of file
+verify.rangeAfterCodeFix("constructor(public p1: string, public p3: any, p5)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInConstructor3.ts b/tests/cases/fourslash/unusedParameterInConstructor3.ts
index 1a9682aece3..3da0e85407f 100644
--- a/tests/cases/fourslash/unusedParameterInConstructor3.ts
+++ b/tests/cases/fourslash/unusedParameterInConstructor3.ts
@@ -5,4 +5,4 @@
 ////    [|constructor(public p1: string, public p2: boolean, private p3: any, p5)|] { p5; }
 //// }
 
-verify.rangeAfterCodeFix("constructor(public p1: string, public p2: boolean, p5)");
\ No newline at end of file
+verify.rangeAfterCodeFix("constructor(public p1: string, public p2: boolean, p5)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInConstructor4.ts b/tests/cases/fourslash/unusedParameterInConstructor4.ts
index 01df43718da..860a7befa9b 100644
--- a/tests/cases/fourslash/unusedParameterInConstructor4.ts
+++ b/tests/cases/fourslash/unusedParameterInConstructor4.ts
@@ -5,4 +5,4 @@
 ////    [|constructor(private readonly p2: boolean, p5)|] { p5; }
 //// }
 
-verify.rangeAfterCodeFix("constructor(p5)");
\ No newline at end of file
+verify.rangeAfterCodeFix("constructor(p5)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInFunction1.ts b/tests/cases/fourslash/unusedParameterInFunction1.ts
index baaccbbd20f..bc6f081ecaa 100644
--- a/tests/cases/fourslash/unusedParameterInFunction1.ts
+++ b/tests/cases/fourslash/unusedParameterInFunction1.ts
@@ -4,4 +4,4 @@
 ////function [|greeter( x)|] {
 ////}
 
-verify.rangeAfterCodeFix("greeter()");
+verify.rangeAfterCodeFix("greeter()", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedParameterInFunction2.ts b/tests/cases/fourslash/unusedParameterInFunction2.ts
index 0e448c98fcc..81e73450622 100644
--- a/tests/cases/fourslash/unusedParameterInFunction2.ts
+++ b/tests/cases/fourslash/unusedParameterInFunction2.ts
@@ -5,4 +5,4 @@
 ////    x++;
 ////}
 
-verify.rangeAfterCodeFix("greeter(x)");
\ No newline at end of file
+verify.rangeAfterCodeFix("greeter(x)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInFunction3.ts b/tests/cases/fourslash/unusedParameterInFunction3.ts
index 23f45475950..dcbe53163db 100644
--- a/tests/cases/fourslash/unusedParameterInFunction3.ts
+++ b/tests/cases/fourslash/unusedParameterInFunction3.ts
@@ -5,4 +5,4 @@
 ////    y++;
 ////}
 
-verify.rangeAfterCodeFix("greeter(y)");
\ No newline at end of file
+verify.rangeAfterCodeFix("greeter(y)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInFunction4.ts b/tests/cases/fourslash/unusedParameterInFunction4.ts
index 1f98238d647..4ea96b3bd18 100644
--- a/tests/cases/fourslash/unusedParameterInFunction4.ts
+++ b/tests/cases/fourslash/unusedParameterInFunction4.ts
@@ -6,4 +6,4 @@
 ////    z++;
 ////}
 
-verify.rangeAfterCodeFix("function greeter(x,z)");
\ No newline at end of file
+verify.rangeAfterCodeFix("function greeter(x,z)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInLambda1.ts b/tests/cases/fourslash/unusedParameterInLambda1.ts
index 166d250fee7..a5f735c7016 100644
--- a/tests/cases/fourslash/unusedParameterInLambda1.ts
+++ b/tests/cases/fourslash/unusedParameterInLambda1.ts
@@ -6,4 +6,4 @@
 ////     [|return (x:number) => {}|]
 //// }
 
-verify.rangeAfterCodeFix("return () => {}");
+verify.rangeAfterCodeFix("return () => {}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts b/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
index 2314ebbe447..bd7c914a614 100644
--- a/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
+++ b/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
@@ -8,4 +8,4 @@
 
 verify.rangeAfterCodeFix(`namespace greeter {
     export type nw = "No" | "Way";
-}`);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass1.ts b/tests/cases/fourslash/unusedTypeParametersInClass1.ts
index 322921ab471..ba31e053727 100644
--- a/tests/cases/fourslash/unusedTypeParametersInClass1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInClass1.ts
@@ -4,4 +4,4 @@
 ////[|class greeter<T> |] {
 ////}
 
-verify.rangeAfterCodeFix("class greeter");
\ No newline at end of file
+verify.rangeAfterCodeFix("class greeter", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass2.ts b/tests/cases/fourslash/unusedTypeParametersInClass2.ts
index feaf9d3a14b..a56f1cf827b 100644
--- a/tests/cases/fourslash/unusedTypeParametersInClass2.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInClass2.ts
@@ -5,4 +5,4 @@
 ////    public a: X;
 ////}
 
-verify.rangeAfterCodeFix("class greeter<X>");
\ No newline at end of file
+verify.rangeAfterCodeFix("class greeter<X>", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass3.ts b/tests/cases/fourslash/unusedTypeParametersInClass3.ts
index b1151265fe3..e5f90dd4066 100644
--- a/tests/cases/fourslash/unusedTypeParametersInClass3.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInClass3.ts
@@ -6,4 +6,4 @@
 ////    public b: Z;
 ////}
 
-verify.rangeAfterCodeFix("class greeter<X, Z>");
+verify.rangeAfterCodeFix("class greeter<X, Z>", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction1.ts b/tests/cases/fourslash/unusedTypeParametersInFunction1.ts
index a11156badaa..d5755275a5a 100644
--- a/tests/cases/fourslash/unusedTypeParametersInFunction1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction1.ts
@@ -3,4 +3,4 @@
 // @noUnusedLocals: true
 //// [|function f1<T>() {}|]
 
-verify.rangeAfterCodeFix("function f1() {}");
+verify.rangeAfterCodeFix("function f1() {}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction2.ts b/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
index a011f093dab..f20010402a8 100644
--- a/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
@@ -3,4 +3,4 @@
 // @noUnusedLocals: true
 //// [|function f1<X, Y>(a: X) {a}|]
 
-verify.rangeAfterCodeFix("function f1<X>(a: X) {a}");
+verify.rangeAfterCodeFix("function f1<X>(a: X) {a}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction3.ts b/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
index 6dc56ccc7cb..5e46ca56aff 100644
--- a/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
@@ -3,4 +3,4 @@
 // @noUnusedLocals: true
 //// [|function f1<X, Y, Z>(a: X) {a;var b:Z;b}|]
 
-verify.rangeAfterCodeFix("function f1<X, Z>(a: X) {a;var b:Z;b}");
+verify.rangeAfterCodeFix("function f1<X, Z>(a: X) {a;var b:Z;b}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeParametersInInterface1.ts b/tests/cases/fourslash/unusedTypeParametersInInterface1.ts
index b5363b369be..6ce19679fce 100644
--- a/tests/cases/fourslash/unusedTypeParametersInInterface1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInInterface1.ts
@@ -4,4 +4,4 @@
 // @noUnusedParameters: true
 //// [|interface I<T> {}|]
 
-verify.rangeAfterCodeFix("interface I {}");
\ No newline at end of file
+verify.rangeAfterCodeFix("interface I {}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda1.ts b/tests/cases/fourslash/unusedTypeParametersInLambda1.ts
index 01c1ebd24f5..8f094b73170 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda1.ts
@@ -6,4 +6,4 @@
 ////     [|return <T>(x:number) => {x}|]
 //// }
 
-verify.rangeAfterCodeFix("return (x:number) => {x}");
+verify.rangeAfterCodeFix("return (x:number) => {x}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda2.ts b/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
index e5a4acc31c5..fc9ccc80f8f 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
@@ -6,4 +6,4 @@
 ////     [|new <T, U>(a: T): void;|]
 //// }
 
-verify.rangeAfterCodeFix("new <T>(a: T): void;");
+verify.rangeAfterCodeFix("new <T>(a: T): void;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda3.ts b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
index e6d866dcb6a..1d2fb9af8d6 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
@@ -7,4 +7,4 @@
 ////     [|new <T, U, K>(a: T): A<U>;|]
 //// }
 
-verify.rangeAfterCodeFix("new <T, U>(a: T): A<U>;");
+verify.rangeAfterCodeFix("new <T, U>(a: T): A<U>;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda4.ts b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
index 04bd7c7e9be..a34e344d17d 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
@@ -6,4 +6,4 @@
 //// }
 //// [|var y: new <T,U>(a:T)=>void;|]
 
-verify.rangeAfterCodeFix("var y: new <T>(a:T)=>void;");
\ No newline at end of file
+verify.rangeAfterCodeFix("var y: new <T>(a:T)=>void;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethod1.ts b/tests/cases/fourslash/unusedTypeParametersInMethod1.ts
index bc14952eca9..36a124fc424 100644
--- a/tests/cases/fourslash/unusedTypeParametersInMethod1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInMethod1.ts
@@ -5,4 +5,4 @@
 ////    [|f1<T extends number>()|] {}
 //// }
 
-verify.rangeAfterCodeFix("f1()");
\ No newline at end of file
+verify.rangeAfterCodeFix("f1()", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethod2.ts b/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
index c12fd53f66b..1d7203f86ac 100644
--- a/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
@@ -5,4 +5,4 @@
 ////    [|f1<T extends number, U>(a: U)|] {a;}
 //// }
 
-verify.rangeAfterCodeFix("f1<U>(a: U)");
\ No newline at end of file
+verify.rangeAfterCodeFix("f1<U>(a: U)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethods1.ts b/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
index d0b170491f5..2a4822628ce 100644
--- a/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
@@ -5,4 +5,4 @@
 ////     [|public f1<X, Y, Z>(a: X)|] { a; var b: Z; b }
 //// }
 
-verify.rangeAfterCodeFix("public f1<X, Z>(a: X)");
+verify.rangeAfterCodeFix("public f1<X, Z>(a: X)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInBlocks.ts b/tests/cases/fourslash/unusedVariableInBlocks.ts
index 2a33d0c4cf5..51deb5c313d 100644
--- a/tests/cases/fourslash/unusedVariableInBlocks.ts
+++ b/tests/cases/fourslash/unusedVariableInBlocks.ts
@@ -12,4 +12,4 @@
 verify.rangeAfterCodeFix(`let x = 10;
    {
    }
-   x;`);
+   x;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInClass1.ts b/tests/cases/fourslash/unusedVariableInClass1.ts
index 8b0ca0db727..177cf7f0197 100644
--- a/tests/cases/fourslash/unusedVariableInClass1.ts
+++ b/tests/cases/fourslash/unusedVariableInClass1.ts
@@ -5,4 +5,4 @@
 ////    [|private greeting: string;|]
 ////}
 
-verify.rangeAfterCodeFix("");
+verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInClass2.ts b/tests/cases/fourslash/unusedVariableInClass2.ts
index 6503dd02872..2f5cf2e3278 100644
--- a/tests/cases/fourslash/unusedVariableInClass2.ts
+++ b/tests/cases/fourslash/unusedVariableInClass2.ts
@@ -6,4 +6,4 @@
 ////    private greeting: string;|]
 ////}
 
-verify.rangeAfterCodeFix("public greeting1;");
+verify.rangeAfterCodeFix("public greeting1;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInClass3.ts b/tests/cases/fourslash/unusedVariableInClass3.ts
index 3ac306170a2..1e05c00f0a1 100644
--- a/tests/cases/fourslash/unusedVariableInClass3.ts
+++ b/tests/cases/fourslash/unusedVariableInClass3.ts
@@ -5,4 +5,4 @@
 ////    private X = function() {};
 ////|]}
 
-verify.rangeAfterCodeFix("");
+verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInForLoop1FS.ts b/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
index 760d8487b34..15727ab70a7 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
@@ -7,5 +7,5 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("for(; ;)");
+verify.rangeAfterCodeFix("for(; ;)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
 
diff --git a/tests/cases/fourslash/unusedVariableInForLoop2FS.ts b/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
index a16f21e8417..5a06ad036f4 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
@@ -7,4 +7,4 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("for(var i = 0; ;i++)");
+verify.rangeAfterCodeFix("for(var i = 0; ;i++)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInForLoop3FS.ts b/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
index 07d13307ca7..32bb54c2241 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
@@ -7,4 +7,4 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("for(var i = 0, k=0; ;i++,k++)");
\ No newline at end of file
+verify.rangeAfterCodeFix("for(var i = 0, k=0; ;i++,k++)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedVariableInForLoop4FS.ts b/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
index d54f8baaa3d..c5589366245 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
@@ -7,4 +7,4 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("for(var j = 0, k=0; ;j++,k++)");
+verify.rangeAfterCodeFix("for(var j = 0, k=0; ;j++,k++)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInForLoop5FS.ts b/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
index 23df03480e3..fdcc51f696f 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
@@ -2,10 +2,9 @@
 
 // @noUnusedLocals: true
 //// function f1 () {
-////     for (const elem in ["a", "b", "c"]) {
+////     [|for (const elem in ["a", "b", "c"]) |]{
 ////
 ////     }
 //// }
 
-verify.not.codeFixAvailable();
-
+verify.rangeAfterCodeFix(`for (const _elem in ["a", "b", "c"])`, /*includeWhiteSpace*/ true, /*errorCode*/ 0, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInForLoop6FS.ts b/tests/cases/fourslash/unusedVariableInForLoop6FS.ts
index a7b8fbfb7c8..fa1948438bc 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop6FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop6FS.ts
@@ -7,5 +7,5 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("const {} of ");
+verify.rangeAfterCodeFix("const {} of ", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
 
diff --git a/tests/cases/fourslash/unusedVariableInForLoop7FS.ts b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
index 7f99863ba46..94f4defca01 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
@@ -13,4 +13,4 @@ verify.rangeAfterCodeFix(`{
     for (const elem of ["a", "b", "c"]) {
         elem;
     }
-}`, /*includeWhiteSpace*/ true);
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInModule1.ts b/tests/cases/fourslash/unusedVariableInModule1.ts
index e9fe9515e6d..115af8bc15d 100644
--- a/tests/cases/fourslash/unusedVariableInModule1.ts
+++ b/tests/cases/fourslash/unusedVariableInModule1.ts
@@ -6,4 +6,4 @@
 //// [|var x: string;
 //// export var y: string;|]
 
-verify.rangeAfterCodeFix("export var y: string;");
+verify.rangeAfterCodeFix("export var y: string;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInModule2.ts b/tests/cases/fourslash/unusedVariableInModule2.ts
index ac6e7120d8b..d2aeea0e82b 100644
--- a/tests/cases/fourslash/unusedVariableInModule2.ts
+++ b/tests/cases/fourslash/unusedVariableInModule2.ts
@@ -7,4 +7,4 @@
 //// z;
 //// export var y: string;
 
-verify.rangeAfterCodeFix("var z: number;");
+verify.rangeAfterCodeFix("var z: number;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInModule3.ts b/tests/cases/fourslash/unusedVariableInModule3.ts
index 0185b89e3a6..f7d565dd50b 100644
--- a/tests/cases/fourslash/unusedVariableInModule3.ts
+++ b/tests/cases/fourslash/unusedVariableInModule3.ts
@@ -6,4 +6,4 @@
 //// [|var x = function f1() {}
 //// export var y: string;|]
 
-verify.rangeAfterCodeFix("export var y: string;");
+verify.rangeAfterCodeFix("export var y: string;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInModule4.ts b/tests/cases/fourslash/unusedVariableInModule4.ts
index 8f23d56b03c..6d80d59c2ce 100644
--- a/tests/cases/fourslash/unusedVariableInModule4.ts
+++ b/tests/cases/fourslash/unusedVariableInModule4.ts
@@ -7,4 +7,4 @@
 //// x;
 //// export var y: string;
 
-verify.rangeAfterCodeFix(`var x = function f1() {}`);
+verify.rangeAfterCodeFix(`var x = function f1() {}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInNamespace1.ts b/tests/cases/fourslash/unusedVariableInNamespace1.ts
index c9f38473a51..d90b7e50603 100644
--- a/tests/cases/fourslash/unusedVariableInNamespace1.ts
+++ b/tests/cases/fourslash/unusedVariableInNamespace1.ts
@@ -5,4 +5,4 @@
 ////    [|let a = "dummy entry";|]
 ////}
 
-verify.rangeAfterCodeFix("");
+verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInNamespace2.ts b/tests/cases/fourslash/unusedVariableInNamespace2.ts
index 992c229014a..664d76130b4 100644
--- a/tests/cases/fourslash/unusedVariableInNamespace2.ts
+++ b/tests/cases/fourslash/unusedVariableInNamespace2.ts
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangeAfterCodeFix(`let a = "dummy entry", c = 0;`);
+verify.rangeAfterCodeFix(`let a = "dummy entry", c = 0;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInNamespace3.ts b/tests/cases/fourslash/unusedVariableInNamespace3.ts
index 0039036b2f8..4de5c0f1534 100644
--- a/tests/cases/fourslash/unusedVariableInNamespace3.ts
+++ b/tests/cases/fourslash/unusedVariableInNamespace3.ts
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangeAfterCodeFix(`let a = "dummy entry", b;`);
+verify.rangeAfterCodeFix(`let a = "dummy entry", b;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);