Take optional string of range text for singleReferenceGroup

src/harness/fourslash.ts

@@ -1001,8 +1001,8 @@ namespace FourSlash {
             assert.deepEqual<ReadonlyArray<ts.ReferenceEntry> | undefined>(refs, expected);
         }
 
-        public verifySingleReferenceGroup(definition: FourSlashInterface.ReferenceGroupDefinition, ranges?: Range[]) {
-            ranges = ranges || this.getRanges();
+        public verifySingleReferenceGroup(definition: FourSlashInterface.ReferenceGroupDefinition, ranges?: Range[] | string) {
+            ranges =  ts.isString(ranges) ? this.rangesByText().get(ranges)! : ranges || this.getRanges();
             this.verifyReferenceGroups(ranges, [{ definition, ranges }]);
         }
 
@@ -3971,7 +3971,7 @@ namespace FourSlashInterface {
             this.state.verifyGetReferencesForServerTest(expected);
         }
 
-        public singleReferenceGroup(definition: ReferenceGroupDefinition, ranges?: FourSlash.Range[]) {
+        public singleReferenceGroup(definition: ReferenceGroupDefinition, ranges?: FourSlash.Range[] | string) {
             this.state.verifySingleReferenceGroup(definition, ranges);
         }
 

tests/cases/fourslash/findAllRefsOnDecorators.ts

@@ -13,4 +13,4 @@
 ////    method() {}
 ////}
 
-verify.singleReferenceGroup("function decorator(target: any): any", test.rangesByText().get("decorator"));
+verify.singleReferenceGroup("function decorator(target: any): any", "decorator");

tests/cases/fourslash/findAllRefsOnDefinition.ts

@@ -23,4 +23,4 @@
 ////second.[|start|]();
 ////second.stop();
 
-verify.singleReferenceGroup("(method) Test.start(): this", test.rangesByText().get("start"));
+verify.singleReferenceGroup("(method) Test.start(): this", "start");

tests/cases/fourslash/findAllRefsOnDefinition2.ts

@@ -14,4 +14,4 @@
 ////var start: Second.Test.[|start|];
 ////var stop: Second.Test.stop;
 
-verify.singleReferenceGroup("interface Test.start", test.rangesByText().get("start"));
+verify.singleReferenceGroup("interface Test.start", "start");

tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts

@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.singleReferenceGroup("(property) ABCD.z: number", test.rangesByText().get("z"));
+verify.singleReferenceGroup("(property) ABCD.z: number", "z");

tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts

@@ -17,4 +17,4 @@
 ////    [|[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 5 |}a|]: "ss"|]
 ////};
 
-verify.singleReferenceGroup("(property) IFoo.a: string", test.rangesByText().get("a"));
+verify.singleReferenceGroup("(property) IFoo.a: string", "a");

tests/cases/fourslash/findAllRefsReExport_broken.ts

@@ -3,4 +3,4 @@
 // @Filename: /a.ts
 ////[|export { [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}x|] };|]
 
-verify.singleReferenceGroup("export x", test.rangesByText().get("x"));
+verify.singleReferenceGroup("export x", "x");

tests/cases/fourslash/findAllRefsReExport_broken2.ts

@@ -3,4 +3,4 @@
 // @Filename: /a.ts
 ////[|export { [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}x|] } from "nonsense";|]
 
-verify.singleReferenceGroup("export x", test.rangesByText().get("x"));
+verify.singleReferenceGroup("export x", "x");

tests/cases/fourslash/findAllRefsTypedef.ts

@@ -12,4 +12,4 @@
 ////let x;
 ////x.[|p|];
 
-verify.singleReferenceGroup("(property) p: number", test.rangesByText().get("p"));
+verify.singleReferenceGroup("(property) p: number", "p");

tests/cases/fourslash/findAllRefsTypedef_importType.ts

@@ -11,4 +11,4 @@
 /////** @type {import('./a').[|Foo|]} */
 ////const x = 0;
 
-verify.singleReferenceGroup("type Foo = number", test.rangesByText().get("Foo"));
+verify.singleReferenceGroup("type Foo = number", "Foo");

tests/cases/fourslash/findAllRefsTypeofImport.ts

@@ -5,4 +5,4 @@
 ////declare const a: typeof import("./a");
 ////a.[|x|];
 
-verify.singleReferenceGroup("const x: 0", test.rangesByText().get("x"));
+verify.singleReferenceGroup("const x: 0", "x");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts

@@ -7,4 +7,4 @@
 ////var x: Foo;
 ////x.[|_bar|];
 
-verify.singleReferenceGroup("(method) Foo._bar(): number", test.rangesByText().get("_bar"));
+verify.singleReferenceGroup("(method) Foo._bar(): number", "_bar");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts

@@ -7,4 +7,4 @@
 ////var x: Foo;
 ////x.[|__bar|];
 
-verify.singleReferenceGroup("(method) Foo.__bar(): number", test.rangesByText().get("__bar"));
+verify.singleReferenceGroup("(method) Foo.__bar(): number", "__bar");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts

@@ -7,4 +7,4 @@
 ////var x: Foo;
 ////x.[|___bar|];
 
-verify.singleReferenceGroup("(method) Foo.___bar(): number", test.rangesByText().get("___bar"));
+verify.singleReferenceGroup("(method) Foo.___bar(): number", "___bar");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts

@@ -7,4 +7,4 @@
 ////var x: Foo;
 ////x.[|____bar|];
 
-verify.singleReferenceGroup("(method) Foo.____bar(): number", test.rangesByText().get("____bar"));
+verify.singleReferenceGroup("(method) Foo.____bar(): number", "____bar");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts

@@ -13,4 +13,4 @@
 ////x.[|___bar|];
 ////x.____bar;
 
-verify.singleReferenceGroup("(property) Foo.___bar: any", test.rangesByText().get("___bar"));
+verify.singleReferenceGroup("(property) Foo.___bar: any", "___bar");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts

@@ -13,4 +13,4 @@
 ////x.___bar;
 ////x.____bar;
 
-verify.singleReferenceGroup("(property) Foo.__bar: any", test.rangesByText().get("__bar"));
+verify.singleReferenceGroup("(property) Foo.__bar: any", "__bar");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts

@@ -4,4 +4,4 @@
 ////    [|__foo|]();
 ////}|]
 
-verify.singleReferenceGroup("function __foo(): void", test.rangesByText().get("__foo"));
+verify.singleReferenceGroup("function __foo(): void", "__foo");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts

@@ -4,4 +4,4 @@
 ////    [|__foo|]();
 ////}|])
 
-verify.singleReferenceGroup("(local function) __foo(): void", test.rangesByText().get("__foo"));
+verify.singleReferenceGroup("(local function) __foo(): void", "__foo");

tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts

@@ -4,4 +4,4 @@
 ////    [|___foo|]();
 ////}|])
 
-verify.singleReferenceGroup("(local function) ___foo(): void", test.rangesByText().get("___foo"));
+verify.singleReferenceGroup("(local function) ___foo(): void", "___foo");

tests/cases/fourslash/findAllRefs_jsEnum.ts

@@ -13,4 +13,4 @@ verify.singleReferenceGroup(
 `enum E
 const E: {
     A: string;
-}`, test.rangesByText().get("E"));
+}`, "E");

tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts

@@ -11,4 +11,4 @@
 /////// <reference path="a.ts" />
 ////[|{| "isWriteAccess": true |}x|]++;
 
-verify.singleReferenceGroup("var x: number", test.rangesByText().get("x"));
+verify.singleReferenceGroup("var x: number", "x");

tests/cases/fourslash/findReferencesAfterEdit.ts

@@ -12,9 +12,9 @@
 ////    x.[|foo|]
 ////}
 
-verify.singleReferenceGroup("(property) A.foo: string", test.rangesByText().get("foo"));
+verify.singleReferenceGroup("(property) A.foo: string", "foo");
 
 goTo.marker("");
 edit.insert("\n");
 
-verify.singleReferenceGroup("(property) A.foo: string", test.rangesByText().get("foo"));
+verify.singleReferenceGroup("(property) A.foo: string", "foo");

tests/cases/fourslash/findReferencesJSXTagName2.ts

@@ -6,4 +6,4 @@
 
 verify.singleReferenceGroup(`const obj: {
     Component: () => any;
-}`, test.rangesByText().get("obj"));
+}`, "obj");

tests/cases/fourslash/fourslash.ts

@@ -227,7 +227,7 @@ declare namespace FourSlashInterface {
          * This uses the 'findReferences' command instead of 'getReferencesAtPosition', so references are grouped by their definition.
          */
         referenceGroups(starts: ArrayOrSingle<string> | ArrayOrSingle<Range>, parts: ReadonlyArray<ReferenceGroup>): void;
-        singleReferenceGroup(definition: ReferencesDefinition, ranges?: Range[]): void;
+        singleReferenceGroup(definition: ReferencesDefinition, ranges?: Range[] | string): void;
         rangesAreOccurrences(isWriteAccess?: boolean, ranges?: Range[]): void;
         rangesWithSameTextAreRenameLocations(...texts: string[]): void;
         rangesAreRenameLocations(options?: Range[] | { findInStrings?: boolean, findInComments?: boolean, ranges?: Range[] });

tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts

@@ -2,4 +2,4 @@
 ////[|var [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}f|] = x => x + 1;|]
 ////[|f|](12);
 
-verify.singleReferenceGroup("var f: (x: any) => any", test.rangesByText().get("f"));
+verify.singleReferenceGroup("var f: (x: any) => any", "f");

tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts

@@ -7,4 +7,4 @@
 ////}|]
 ////let c = new [|C|]();
 
-verify.singleReferenceGroup("class C", test.rangesByText().get("C"));
+verify.singleReferenceGroup("class C", "C");

tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts

@@ -3,4 +3,4 @@
 ////let y = o.[|foo|];
 ////let z = o['[|foo|]'];
 
-verify.singleReferenceGroup('(property) ["foo"]: number', test.rangesByText().get("foo"));
+verify.singleReferenceGroup('(property) ["foo"]: number', "foo");

tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts

@@ -5,4 +5,4 @@
 ////}|]
 ////let first = [|E|].First;
 
-verify.singleReferenceGroup("enum E", test.rangesByText().get("E"));
+verify.singleReferenceGroup("enum E", "E");

tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts

@@ -3,4 +3,4 @@
 ////}|]
 ////[|func|](x)
 
-verify.singleReferenceGroup("function func(x: number): void", test.rangesByText().get("func"));
+verify.singleReferenceGroup("function func(x: number): void", "func");

tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts

@@ -4,4 +4,4 @@
 ////}|]
 ////let i: [|I|] = { p: 12 };
 
-verify.singleReferenceGroup("interface I", test.rangesByText().get("I"));
+verify.singleReferenceGroup("interface I", "I");

tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts

@@ -13,4 +13,4 @@
 ////let i: [|Numbers|] = new [|Numbers|]();
 ////let x = i.f(i.p + i.m);
 
-verify.singleReferenceGroup("class Numbers\ninterface Numbers", test.rangesByText().get("Numbers"));
+verify.singleReferenceGroup("class Numbers\ninterface Numbers", "Numbers");

tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts

@@ -4,4 +4,4 @@
 ////}|]
 ////let x = [|Numbers|].n + 1;
 
-verify.singleReferenceGroup("namespace Numbers", test.rangesByText().get("Numbers"));
+verify.singleReferenceGroup("namespace Numbers", "Numbers");

tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts

@@ -2,4 +2,4 @@
 ////let o = { [|[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}1|]: 12|] };
 ////let y = o[[|1|]];
 
-verify.singleReferenceGroup("(property) 1: number", test.rangesByText().get("1"));
+verify.singleReferenceGroup("(property) 1: number", "1");

tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts

@@ -3,4 +3,4 @@
 ////  return [|x|] + 1
 ////}
 
-verify.singleReferenceGroup("(parameter) x: number", test.rangesByText().get("x"));
+verify.singleReferenceGroup("(parameter) x: number", "x");

tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts

@@ -2,4 +2,4 @@
 ////let o = { [|"[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}x|]": 12|] };
 ////let y = o.[|x|];
 
-verify.singleReferenceGroup('(property) "x": number', test.rangesByText().get("x"));
+verify.singleReferenceGroup('(property) "x": number', "x");

tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts

@@ -2,4 +2,4 @@
 ////[|type [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}Alias|]= number;|]
 ////let n: [|Alias|] = 12;
 
-verify.singleReferenceGroup("type Alias = number", test.rangesByText().get("Alias"));
+verify.singleReferenceGroup("type Alias = number", "Alias");

tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts

@@ -17,4 +17,4 @@
 ////[|{| "isWriteAccess": true |}x|] += 1;
 ////[|{| "isWriteAccess": true |}x|] <<= 1;
 
-verify.singleReferenceGroup("var x: number", test.rangesByText().get("x"));
+verify.singleReferenceGroup("var x: number", "x");

tests/cases/fourslash/jsdocTypedefTagSemanticMeaning1.ts

@@ -9,4 +9,4 @@
 /////** @type {[|T|]} */
 ////const n = [|T|];
 
-verify.singleReferenceGroup("type T = number\nconst T: 1", test.rangesByText().get("T"));
+verify.singleReferenceGroup("type T = number\nconst T: 1", "T");

tests/cases/fourslash/referenceToClass.ts

@@ -20,5 +20,4 @@
 // @Filename: referenceToClass_2.ts
 ////var k: [|foo|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.singleReferenceGroup("class foo", ranges);
+verify.singleReferenceGroup("class foo", "foo");

tests/cases/fourslash/referencesBloomFilters.ts

@@ -14,4 +14,4 @@
 // @Filename: redeclaration.ts
 ////container = { [|"[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 4 |}searchProp|]" : 18|] };
 
-verify.singleReferenceGroup("(property) searchProp: number", test.rangesByText().get("searchProp"));
+verify.singleReferenceGroup("(property) searchProp: number", "searchProp");

tests/cases/fourslash/referencesBloomFilters2.ts

@@ -14,4 +14,4 @@
 // @Filename: redeclaration.ts
 ////container = { [|"[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 4 |}42|]" : 18|] };
 
-verify.singleReferenceGroup("(property) 42: number", test.rangesByText().get("42"));
+verify.singleReferenceGroup("(property) 42: number", "42");

tests/cases/fourslash/referencesBloomFilters3.ts

@@ -9,4 +9,4 @@
 // @Filename: expression.ts
 ////(Test[[|42|]]);
 
-verify.singleReferenceGroup('(enum member) Test["42"] = 1', test.rangesByText().get("42"));
+verify.singleReferenceGroup('(enum member) Test["42"] = 1', "42");

tests/cases/fourslash/referencesForAmbients2.ts

@@ -18,4 +18,4 @@
 ////}
 
 verify.noErrors();
-verify.singleReferenceGroup("type T = number", test.rangesByText().get("T"));
+verify.singleReferenceGroup("type T = number", "T");

tests/cases/fourslash/referencesForClassLocal.ts

@@ -20,4 +20,4 @@
 ////    }
 ////}
 
-verify.singleReferenceGroup("(property) foo.n: number", test.rangesByText().get("n"));
+verify.singleReferenceGroup("(property) foo.n: number", "n");

tests/cases/fourslash/referencesForClassParameter.ts

@@ -19,4 +19,4 @@
 ////var n = new foo(undefined);
 ////n.[|{| "isWriteAccess": true |}p|] = null;
 
-verify.singleReferenceGroup("(property) foo.p: any", test.rangesByText().get("p"));
+verify.singleReferenceGroup("(property) foo.p: any", "p");

tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts

@@ -25,4 +25,4 @@
 ////// Untped -- should not be included
 ////var u = { xy: 0 };
 
-verify.singleReferenceGroup("(property) IFoo.xy: number", test.rangesByText().get("xy"));
+verify.singleReferenceGroup("(property) IFoo.xy: number", "xy");

tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts

@@ -34,4 +34,4 @@
 ////var u1 = { a: 0, b: 0, common: "" };
 ////var u2 = { b: 0, common: 0 };
 
-verify.singleReferenceGroup("(property) B.b: number", test.rangesByText().get("b"));
+verify.singleReferenceGroup("(property) B.b: number", "b");

tests/cases/fourslash/referencesForEnums.ts

@@ -11,7 +11,6 @@
 ////E.[|value2|];
 ////E[[|111|]];
 
-const r = test.rangesByText();
-verify.singleReferenceGroup("(enum member) E.value1 = 1", r.get("value1"));
-verify.singleReferenceGroup("(enum member) E[\"value2\"] = 1", r.get("value2"));
-verify.singleReferenceGroup("(enum member) E[111] = 11", r.get("111"));
+verify.singleReferenceGroup("(enum member) E.value1 = 1", "value1");
+verify.singleReferenceGroup("(enum member) E[\"value2\"] = 1", "value2");
+verify.singleReferenceGroup("(enum member) E[111] = 11", "111");

tests/cases/fourslash/referencesForExportedValues.ts

@@ -10,4 +10,4 @@
 ////// external use
 ////M.[|variable|]
 
-verify.singleReferenceGroup("var M.variable: number", test.rangesByText().get("variable"));
+verify.singleReferenceGroup("var M.variable: number", "variable");

tests/cases/fourslash/referencesForExternalModuleNames.ts

@@ -8,4 +8,4 @@
 // @Filename: referencesForGlobals_2.ts
 ////import f = require("[|foo|]");
 
-verify.singleReferenceGroup('module "foo"', test.rangesByText().get("foo"));
+verify.singleReferenceGroup('module "foo"', "foo");

tests/cases/fourslash/referencesForFunctionOverloads.ts

@@ -7,4 +7,4 @@
 ////    [|foo|]('', 43);
 ////}|]
 
-verify.singleReferenceGroup("function foo(x: string): any", test.rangesByText().get("foo"));
+verify.singleReferenceGroup("function foo(x: string): any", "foo");

tests/cases/fourslash/referencesForFunctionParameter.ts

@@ -8,4 +8,4 @@
 ////    x = [|n|];
 ////}
 
-verify.singleReferenceGroup("(parameter) n: number", test.rangesByText().get("n"));
+verify.singleReferenceGroup("(parameter) n: number", "n");

tests/cases/fourslash/referencesForGlobals.ts

@@ -25,4 +25,4 @@
 // @Filename: referencesForGlobals_2.ts
 ////var m = [|global|];
 
-verify.singleReferenceGroup("var global: number", test.rangesByText().get("global"));
+verify.singleReferenceGroup("var global: number", "global");

tests/cases/fourslash/referencesForGlobals2.ts

@@ -10,4 +10,4 @@
 // @Filename: referencesForGlobals_2.ts
 ////var c = [|globalClass|]();
 
-verify.singleReferenceGroup("class globalClass", test.rangesByText().get("globalClass"));
+verify.singleReferenceGroup("class globalClass", "globalClass");

tests/cases/fourslash/referencesForGlobals3.ts

@@ -10,4 +10,4 @@
 // @Filename: referencesForGlobals_2.ts
 ////var i: [|globalInterface|];
 
-verify.singleReferenceGroup("interface globalInterface", test.rangesByText().get("globalInterface"));
+verify.singleReferenceGroup("interface globalInterface", "globalInterface");

tests/cases/fourslash/referencesForGlobals4.ts

@@ -10,4 +10,4 @@
 // @Filename: referencesForGlobals_2.ts
 ////var m = [|globalModule|];
 
-verify.singleReferenceGroup("namespace globalModule", test.rangesByText().get("globalModule"));
+verify.singleReferenceGroup("namespace globalModule", "globalModule");

tests/cases/fourslash/referencesForGlobals5.ts

@@ -12,4 +12,4 @@
 // @Filename: referencesForGlobals_2.ts
 ////var m = [|globalAlias|];
 
-verify.singleReferenceGroup("(alias) namespace globalAlias\nimport globalAlias = globalModule", test.rangesByText().get("globalAlias"));
+verify.singleReferenceGroup("(alias) namespace globalAlias\nimport globalAlias = globalModule", "globalAlias");

tests/cases/fourslash/referencesForGlobalsInExternalModule.ts

@@ -18,11 +18,7 @@
 ////
 ////export = x;
 
-const ranges = test.rangesByText();
-verify.singleReferenceGroup("var topLevelVar: number", ranges.get("topLevelVar"));
-
-const topLevelClass = ranges.get("topLevelClass");
-verify.singleReferenceGroup("class topLevelClass", topLevelClass);
-
-verify.singleReferenceGroup("interface topLevelInterface", ranges.get("topLevelInterface"));
-verify.singleReferenceGroup("namespace topLevelModule", ranges.get("topLevelModule"));
+verify.singleReferenceGroup("var topLevelVar: number", "topLevelVar");
+verify.singleReferenceGroup("class topLevelClass", "topLevelClass");
+verify.singleReferenceGroup("interface topLevelInterface", "topLevelInterface");
+verify.singleReferenceGroup("namespace topLevelModule", "topLevelModule");

tests/cases/fourslash/referencesForIllegalAssignment.ts

@@ -11,4 +11,4 @@ verify.noReferences();
 goTo.marker("2");
 verify.noReferences();
 
-verify.singleReferenceGroup("var bar: () => void", test.rangesByText().get("bar"));
+verify.singleReferenceGroup("var bar: () => void", "bar");

tests/cases/fourslash/referencesForIndexProperty.ts

@@ -11,6 +11,5 @@
 ////f["[|property|]"];
 ////f["[|method|]"];
 
-const ranges = test.rangesByText();
-verify.singleReferenceGroup("(property) Foo.property: number", ranges.get("property"));
-verify.singleReferenceGroup("(method) Foo.method(): void", ranges.get("method"));
+verify.singleReferenceGroup("(property) Foo.property: number", "property");
+verify.singleReferenceGroup("(method) Foo.method(): void", "method");

tests/cases/fourslash/referencesForIndexProperty3.ts

@@ -12,4 +12,4 @@
 ////var x = {};
 ////x["[|toMyString|]"]();
 
-verify.singleReferenceGroup("(method) Object.toMyString(): any", test.rangesByText().get("toMyString"));
+verify.singleReferenceGroup("(method) Object.toMyString(): any", "toMyString");

tests/cases/fourslash/referencesForInheritedProperties3.ts

@@ -9,6 +9,5 @@
 //// v.[|propName|];
 //// v.[|doStuff|]();
 
-const ranges = test.rangesByText();
-verify.singleReferenceGroup("(method) interface1.doStuff(): void", ranges.get("doStuff"));
-verify.singleReferenceGroup("(property) interface1.propName: string", ranges.get("propName"));
+verify.singleReferenceGroup("(method) interface1.doStuff(): void", "doStuff");
+verify.singleReferenceGroup("(property) interface1.propName: string", "propName");

tests/cases/fourslash/referencesForInheritedProperties4.ts

@@ -9,7 +9,5 @@
 //// c.[|doStuff|]();
 //// c.[|propName|];
 
-const ranges = test.rangesByText();
-const [r0, r1] = ranges.get("doStuff");
-verify.singleReferenceGroup("(method) class1.doStuff(): void", ranges.get("doStuff"));
-verify.singleReferenceGroup("(property) class1.propName: string", ranges.get("propName"));
+verify.singleReferenceGroup("(method) class1.doStuff(): void", "doStuff");
+verify.singleReferenceGroup("(property) class1.propName: string", "propName");

tests/cases/fourslash/referencesForLabel6.ts

@@ -7,6 +7,5 @@
 ////            break labelc;
 ////}
 
-const ranges = test.rangesByText();
-verify.singleReferenceGroup("labela", ranges.get("labela"));
-verify.singleReferenceGroup("labelb", ranges.get("labelb"));
+verify.singleReferenceGroup("labela", "labela");
+verify.singleReferenceGroup("labelb", "labelb");

tests/cases/fourslash/referencesForMergedDeclarations2.ts

@@ -15,4 +15,4 @@ verify.singleReferenceGroup([
     "(alias) function alias(): void",
     "(alias) namespace alias",
     "import alias = ATest"
-].join("\n"), test.rangesByText().get("alias"));
+].join("\n"), "alias");

tests/cases/fourslash/referencesForMergedDeclarations4.ts

@@ -22,4 +22,4 @@
 ////[|testClass|].s;
 ////new [|testClass|]();
 
-verify.singleReferenceGroup("class testClass\nnamespace testClass", test.rangesByText().get("testClass"));
+verify.singleReferenceGroup("class testClass\nnamespace testClass", "testClass");

tests/cases/fourslash/referencesForMergedDeclarations6.ts

@@ -10,4 +10,4 @@
 ////// module
 ////import a1 = [|Foo|];
 
-verify.singleReferenceGroup("namespace Foo", test.rangesByText().get("Foo"));
+verify.singleReferenceGroup("namespace Foo", "Foo");

tests/cases/fourslash/referencesForMergedDeclarations8.ts

@@ -10,4 +10,4 @@
 ////// module
 ////import a3 = Foo.[|Bar|].Baz;
 
-verify.singleReferenceGroup("namespace Foo.Bar", test.rangesByText().get("Bar"));
+verify.singleReferenceGroup("namespace Foo.Bar", "Bar");

tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts

@@ -9,4 +9,4 @@
 ////x = { [|"[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 3 |}12|]": 0|] };
 ////x = { [|[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 5 |}12|]: 0|] };
 
-verify.singleReferenceGroup("(property) Foo[12]: any", test.rangesByText().get("12"));
+verify.singleReferenceGroup("(property) Foo[12]: any", "12");

tests/cases/fourslash/referencesForObjectLiteralProperties.ts

@@ -8,5 +8,4 @@
 ////var y = x;
 ////y.[|add|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.singleReferenceGroup("(property) add: number", ranges);
+verify.singleReferenceGroup("(property) add: number", "add");

tests/cases/fourslash/referencesForPropertiesOfGenericType.ts

@@ -10,5 +10,4 @@
 ////var y: IFoo<number>;
 ////y.[|doSomething|](12);
 
-const [rDef, ...ranges] = test.ranges();
-verify.singleReferenceGroup("(method) IFoo<T>.doSomething(v: T): T", ranges);
+verify.singleReferenceGroup("(method) IFoo<T>.doSomething(v: T): T", "doSomething");

tests/cases/fourslash/referencesForStatic.ts

@@ -30,5 +30,4 @@
 // @Filename: referencesOnStatic_2.ts
 ////var q = foo.[|n|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.singleReferenceGroup("(property) foo.n: string", ranges);
+verify.singleReferenceGroup("(property) foo.n: string", "n");

tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts

@@ -10,4 +10,4 @@
 ////x = { [|"[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 4 |}ss|]": 0|] };
 ////x = { [|[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 6 |}ss|]: 0|] };
 
-verify.singleReferenceGroup('(property) Foo["ss"]: any', test.rangesByText().get("ss"));
+verify.singleReferenceGroup('(property) Foo["ss"]: any', "ss");

tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts

@@ -7,4 +7,4 @@
 ////var x: Foo;
 ////x.[|blah|];
 
-verify.singleReferenceGroup('(method) Foo["blah"](): number', test.rangesByText().get("blah"));
+verify.singleReferenceGroup('(method) Foo["blah"](): number', "blah");

tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts

@@ -8,5 +8,4 @@
 ////var y: Foo2;
 ////y[[|42|]];
 
-
-verify.singleReferenceGroup('(property) Foo2["42"]: number', test.rangesByText().get("42"));
+verify.singleReferenceGroup('(property) Foo2["42"]: number', "42");

tests/cases/fourslash/renameJsExports01.ts

@@ -8,6 +8,5 @@
 ////var mod = require('./a');
 ////var t = mod./**/[|area|](10);
 
-const [rDef, ...ranges] = test.ranges();
-verify.singleReferenceGroup("(property) area: (r: any) => number", ranges);
-verify.rangesAreRenameLocations(ranges);
+verify.singleReferenceGroup("(property) area: (r: any) => number", "area");
+verify.rangesWithSameTextAreRenameLocations("area");

tests/cases/fourslash/tsxFindAllReferences1.ts

@@ -13,11 +13,8 @@
 //// }
 //// var x = <[|div|] />;
 
-const rangesByText = test.rangesByText();
 verify.singleReferenceGroup(
     `(property) JSX.IntrinsicElements.div: {
     name?: string;
     isOpen?: boolean;
-}`,
-    rangesByText.get("div")
-);
+}`, "div");

tests/cases/fourslash/tsxFindAllReferences10.ts

@@ -30,8 +30,4 @@
 //// let opt = <MainButton goTo="goTo" />;
 //// let opt = <MainButton wrong />;
 
-const rangesByText = test.rangesByText();
-verify.singleReferenceGroup(
-    "(method) ButtonProps.onClick(event?: any): void",
-    rangesByText.get("onClick")
-);
+verify.singleReferenceGroup("(method) ButtonProps.onClick(event?: any): void", "onClick");

tests/cases/fourslash/tsxFindAllReferences2.ts

@@ -13,8 +13,4 @@
 //// }
 //// var x = <div [|[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}name|]="hello"|] />;
 
-const rangesByText = test.rangesByText();
-verify.singleReferenceGroup(
-    "(property) name?: string",
-    rangesByText.get("name")
-);
+verify.singleReferenceGroup("(property) name?: string", "name");

tests/cases/fourslash/tsxFindAllReferences3.ts

@@ -16,8 +16,4 @@
 ////
 //// var x = <MyClass [|[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}name|]='hello'|]/>;
 
-const rangesByText = test.rangesByText();
-verify.singleReferenceGroup(
-    "(property) name?: string",
-    rangesByText.get("name")
-);
+verify.singleReferenceGroup("(property) name?: string", "name");

tests/cases/fourslash/tsxFindAllReferences4.ts

@@ -16,8 +16,4 @@
 ////
 //// var x = <[|MyClass|] name='hello'></[|MyClass|]>;
 
-const rangesByText = test.rangesByText();
-verify.singleReferenceGroup(
-    "class MyClass",
-    rangesByText.get("MyClass")
-);
+verify.singleReferenceGroup("class MyClass", "MyClass");

tests/cases/fourslash/tsxFindAllReferences5.ts

@@ -22,8 +22,7 @@
 //// let opt3 = <[|Opt|] wrong />;
 //// let opt4 = <[|Opt|] propx={100} propString="hi" />;
 
-const rangesByText = test.rangesByText();
 verify.singleReferenceGroup(
     "function Opt(attributes: OptionPropBag): JSX.Element",
-    rangesByText.get("Opt")
+    "Opt"
 );

tests/cases/fourslash/tsxFindAllReferences7.ts

@@ -21,8 +21,4 @@
 //// let opt2 = <Opt [|[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 4 |}propx|]={100}|] optional/>;
 //// let opt3 = <Opt wrong />;
 
-const rangesByText = test.rangesByText();
-verify.singleReferenceGroup(
-    "(property) OptionPropBag.propx: number",
-    rangesByText.get("propx")
-);
+verify.singleReferenceGroup("(property) OptionPropBag.propx: number", "propx");

tests/cases/fourslash/tsxFindAllReferences8.ts

@@ -30,8 +30,7 @@
 //// let opt = <[|MainButton|] goTo="goTo" />;
 //// let opt = <[|MainButton|] wrong />;
 
-const rangesByText = test.rangesByText();
 verify.singleReferenceGroup(
     "function MainButton(buttonProps: ButtonProps): JSX.Element (+2 overloads)",
-    rangesByText.get("MainButton")
+    "MainButton"
 );

tests/cases/fourslash/tsxFindAllReferences9.ts

@@ -31,5 +31,4 @@
 //// let opt = <MainButton [|{| "isWriteAccess": true, "isDefinition": true |}goTo|] />;
 //// let opt = <MainButton wrong />;
 
-const rangesByText = test.rangesByText();
-verify.singleReferenceGroup("(property) LinkProps.goTo: string", rangesByText.get("goTo"));
+verify.singleReferenceGroup("(property) LinkProps.goTo: string", "goTo");

tests/cases/fourslash/tsxFindAllReferencesUnionElementType1.ts

@@ -21,9 +21,8 @@
 //// [|var [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}SFCComp|] = SFC1 || SFC2;|]
 //// <[|SFCComp|] x={ "hi" } />
 
-const [, r1, r2] = test.ranges();
 verify.singleReferenceGroup(`var SFCComp: ((prop: {
     x: number;
 }) => JSX.Element) | ((prop: {
     x: boolean;
-}) => JSX.Element)`, [r1, r2]);
+}) => JSX.Element)`, "SFCComp");

tests/cases/fourslash/tsxFindAllReferencesUnionElementType2.ts

@@ -20,5 +20,4 @@
 //// [|var [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}RCComp|] = RC1 || RC2;|]
 //// <[|RCComp|] />
 
-const [, r1, r2 ] = test.ranges();
-verify.singleReferenceGroup("var RCComp: typeof RC1", [r1, r2]);
+verify.singleReferenceGroup("var RCComp: typeof RC1", "RCComp");