From 2fc1143fe728fed2e9ce298eaf360a44d1de2a53 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 31 May 2019 10:23:07 -0700
Subject: [PATCH] More tests

---
 tests/cases/fourslash/renameRest.ts                | 6 ++++--
 tests/cases/fourslash/renameStringPropertyNames.ts | 7 ++++---
 tests/cases/fourslash/renameThis.ts                | 6 +++---
 tests/cases/fourslash/renameUMDModuleAlias1.ts     | 5 +++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tests/cases/fourslash/renameRest.ts b/tests/cases/fourslash/renameRest.ts
index 60fc1bbb227..da1f590dd70 100644
--- a/tests/cases/fourslash/renameRest.ts
+++ b/tests/cases/fourslash/renameRest.ts
@@ -1,11 +1,13 @@
 /// <reference path='fourslash.ts'/>
 ////interface Gen {
 ////    x: number;
-////    [|parent|]: Gen;
+////    [|[|{| "declarationRangeIndex": 0 |}parent|]: Gen;|]
 ////    millenial: string;
 ////}
 ////let t: Gen;
 ////var { x, ...rest } = t;
 ////rest.[|parent|];
 
-verify.rangesAreRenameLocations();
+
+const rangesByText = test.rangesByText();
+verify.rangesAreRenameLocations(rangesByText.get("parent"));
diff --git a/tests/cases/fourslash/renameStringPropertyNames.ts b/tests/cases/fourslash/renameStringPropertyNames.ts
index 13863b043e7..8d34ee458ea 100644
--- a/tests/cases/fourslash/renameStringPropertyNames.ts
+++ b/tests/cases/fourslash/renameStringPropertyNames.ts
@@ -1,15 +1,16 @@
 /// <reference path='fourslash.ts' />
 
 ////var o = {
-////    [|prop|]: 0
+////    [|[|{| "declarationRangeIndex": 0 |}prop|]: 0|]
 ////};
 ////
 ////o = {
-////    "[|prop|]": 1
+////    [|"[|{| "declarationRangeIndex": 2 |}prop|]": 1|]
 ////};
 ////
 ////o["[|prop|]"];
 ////o['[|prop|]'];
 ////o.[|prop|];
 
-verify.rangesAreRenameLocations();
+const rangesByText = test.rangesByText();
+verify.rangesAreRenameLocations(rangesByText.get("prop"));
diff --git a/tests/cases/fourslash/renameThis.ts b/tests/cases/fourslash/renameThis.ts
index e626294bf46..7a209c0d6cc 100644
--- a/tests/cases/fourslash/renameThis.ts
+++ b/tests/cases/fourslash/renameThis.ts
@@ -1,12 +1,12 @@
 /// <reference path='fourslash.ts'/>
 
-////function f([|this|]) {
+////function f([|{| "declarationRangeIndex": 0 |}this|]) {
 ////    return [|this|];
 ////}
 ////this/**/;
-////const _ = { [|this|]: 0 }.[|this|];
+////const _ = { [|[|{| "declarationRangeIndex": 2 |}this|]: 0|] }.[|this|];
 
-const [r0, r1, r2, r3] = test.ranges()
+const [r0, r1, r2Def, r2, r3] = test.ranges()
 verify.rangesAreRenameLocations([r0, r1]);
 
 // Trying to rename a non-parameter 'this' should fail
diff --git a/tests/cases/fourslash/renameUMDModuleAlias1.ts b/tests/cases/fourslash/renameUMDModuleAlias1.ts
index c44e459b008..510e117007b 100644
--- a/tests/cases/fourslash/renameUMDModuleAlias1.ts
+++ b/tests/cases/fourslash/renameUMDModuleAlias1.ts
@@ -4,10 +4,11 @@
 //// export function doThing(): string;
 //// export function doTheOtherThing(): void;
 
-//// export as namespace [|myLib|];
+//// [|export as namespace [|{| "declarationRangeIndex": 0 |}myLib|];|]
 
 // @Filename: 1.ts
 //// /// <reference path="0.d.ts" />
 //// [|myLib|].doThing();
 
-verify.rangesAreRenameLocations();
+const rangesByText = test.rangesByText();
+verify.rangesAreRenameLocations(rangesByText.get("myLib"));