From 64de998356c16cec75eaaab52e8778d868b159b3 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 6 Jun 2019 09:00:57 -0700
Subject: [PATCH] More tests

---
 tests/cases/fourslash/findAllRefsEnumAsNamespace.ts       | 4 ++--
 tests/cases/fourslash/findAllRefsExportAsNamespace.ts     | 7 +++----
 .../cases/fourslash/findAllRefsExportConstEqualToClass.ts | 8 ++++----
 .../fourslash/findAllRefsExportDefaultClassConstructor.ts | 4 ++--
 tests/cases/fourslash/findAllRefsExportNotAtTopLevel.ts   | 4 ++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/tests/cases/fourslash/findAllRefsEnumAsNamespace.ts b/tests/cases/fourslash/findAllRefsEnumAsNamespace.ts
index a065f355d10..e98da5f8d9f 100644
--- a/tests/cases/fourslash/findAllRefsEnumAsNamespace.ts
+++ b/tests/cases/fourslash/findAllRefsEnumAsNamespace.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-////enum [|{| "isWriteAccess": true, "isDefinition": true |}E|] { A }
+////[|enum [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}E|] { A }|]
 ////let e: [|E|].A;
 
-verify.singleReferenceGroup("enum E");
+verify.singleReferenceGroup("enum E", "E");
diff --git a/tests/cases/fourslash/findAllRefsExportAsNamespace.ts b/tests/cases/fourslash/findAllRefsExportAsNamespace.ts
index f6149f17d90..e97d3411ce4 100644
--- a/tests/cases/fourslash/findAllRefsExportAsNamespace.ts
+++ b/tests/cases/fourslash/findAllRefsExportAsNamespace.ts
@@ -3,19 +3,18 @@
 // `export as namespace` results in global search.
 
 // @Filename: /node_modules/a/index.d.ts
-////export function [|{| "isWriteAccess": true, "isDefinition": true |}f|](): void;
+////[|export function [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}f|](): void;|]
 ////export as namespace A;
 
 // @Filename: /b.ts
-////import { [|{| "isWriteAccess": true, "isDefinition": true |}f|] } from "a";
+////[|import { [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}f|] } from "a";|]
 
 // @Filename: /c.ts
 ////A.[|f|]();
 
 verify.noErrors();
 
-const ranges = test.ranges();
-const [r0, r1, r2] = ranges;
+const [r0Def, r0, r1Def, r1, r2] = test.ranges();
 
 const globals = { definition: "function f(): void", ranges: [r0, r2] };
 const imports = { definition: "(alias) function f(): void\nimport f", ranges: [r1] };
diff --git a/tests/cases/fourslash/findAllRefsExportConstEqualToClass.ts b/tests/cases/fourslash/findAllRefsExportConstEqualToClass.ts
index 6be7ea0bdba..98ab1b3a456 100644
--- a/tests/cases/fourslash/findAllRefsExportConstEqualToClass.ts
+++ b/tests/cases/fourslash/findAllRefsExportConstEqualToClass.ts
@@ -1,13 +1,13 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: /a.ts
-////class [|{| "isWriteAccess": true, "isDefinition": true |}C|] {}
-////export const [|{| "isWriteAccess": true, "isDefinition": true |}D|] = [|C|];
+////[|class [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}C|] {}|]
+////[|export const [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}D|] = [|C|];|]
 
 // @Filename: /b.ts
-////import { [|{| "isWriteAccess": true, "isDefinition": true |}D|] } from "./a";
+////[|import { [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 5 |}D|] } from "./a";|]
 
-const [C0, D0, C1, D1] = test.ranges();
+const [C0Def, C0, D0Def, D0, C1, D1Def, D1] = test.ranges();
 
 verify.singleReferenceGroup("class C", [C0, C1]);
 
diff --git a/tests/cases/fourslash/findAllRefsExportDefaultClassConstructor.ts b/tests/cases/fourslash/findAllRefsExportDefaultClassConstructor.ts
index 0f269bd5f5b..e8754ff15be 100644
--- a/tests/cases/fourslash/findAllRefsExportDefaultClassConstructor.ts
+++ b/tests/cases/fourslash/findAllRefsExportDefaultClassConstructor.ts
@@ -1,5 +1,5 @@
 ////export default class {
-////    [|constructor|]() {}
+////    [|[|{| "declarationRangeIndex": 0 |}constructor|]() {}|]
 ////}
 
-verify.singleReferenceGroup("class default");
+verify.singleReferenceGroup("class default", "constructor");
diff --git a/tests/cases/fourslash/findAllRefsExportNotAtTopLevel.ts b/tests/cases/fourslash/findAllRefsExportNotAtTopLevel.ts
index 7f9c258bbe2..a99116726f8 100644
--- a/tests/cases/fourslash/findAllRefsExportNotAtTopLevel.ts
+++ b/tests/cases/fourslash/findAllRefsExportNotAtTopLevel.ts
@@ -1,8 +1,8 @@
 /// <reference path="fourslash.ts" />
 
 ////{
-////    export const [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 0;
+////    [|export const [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}x|] = 0;|]
 ////    [|x|];
 ////}
 
-verify.singleReferenceGroup("const x: 0");
+verify.singleReferenceGroup("const x: 0", "x");