Take optional texts to verify parameter for rangesWithSameTextAreRenameLocations

Author: sheetalkamat

src/harness/fourslash.ts

@@ -2720,8 +2720,13 @@ Actual: ${stringify(fullActual)}`);
             }
         }
 
-        public verifyRangesWithSameTextAreRenameLocations() {
-            this.rangesByText().forEach(ranges => this.verifyRangesAreRenameLocations(ranges));
+        public verifyRangesWithSameTextAreRenameLocations(...texts: string[]) {
+            if (texts.length) {
+                texts.forEach(text => this.verifyRangesAreRenameLocations(this.rangesByText().get(text)!));
+            }
+            else {
+                this.rangesByText().forEach(ranges => this.verifyRangesAreRenameLocations(ranges));
+            }
         }
 
         public verifyRangesWithSameTextAreDocumentHighlights() {
@@ -4088,8 +4093,8 @@ namespace FourSlashInterface {
             this.state.verifyRangesAreOccurrences(isWriteAccess, ranges);
         }
 
-        public rangesWithSameTextAreRenameLocations() {
-            this.state.verifyRangesWithSameTextAreRenameLocations();
+        public rangesWithSameTextAreRenameLocations(...texts: string[]) {
+            this.state.verifyRangesWithSameTextAreRenameLocations(...texts);
         }
 
         public rangesAreRenameLocations(options?: FourSlash.Range[] | { findInStrings?: boolean, findInComments?: boolean, ranges?: FourSlash.Range[] }) {

tests/cases/fourslash/findAllRefsOnImportAliases2.ts

@@ -1,14 +1,14 @@
 /// <reference path="fourslash.ts" />
 
 //@Filename: a.ts
-////export class [|{| "isWriteAccess": true, "isDefinition": true |}Class|] {}
+////[|export class [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}Class|] {}|]
 
 //@Filename: b.ts
-////import { [|Class|] as [|{| "isWriteAccess": true, "isDefinition": true |}C2|] } from "./a";
+////[|import { [|{| "declarationRangeIndex": 2 |}Class|] as [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}C2|] } from "./a";|]
 ////var c = new [|C2|]();
 
 //@Filename: c.ts
-////export { [|Class|] as [|{| "isWriteAccess": true, "isDefinition": true |}C3|] } from "./a";
+////[|export { [|{| "declarationRangeIndex": 6 |}Class|] as [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 6 |}C3|] } from "./a";|]
 
 const ranges = test.rangesByText();
 const classRanges = ranges.get("Class");
@@ -26,4 +26,4 @@ verify.referenceGroups(c2Ranges, [c2s])
 
 verify.referenceGroups(c3Ranges, [c3s]);
 
-verify.rangesWithSameTextAreRenameLocations();
+verify.rangesWithSameTextAreRenameLocations("Class", "C2", "C3");

tests/cases/fourslash/fourslash.ts

@@ -229,7 +229,7 @@ declare namespace FourSlashInterface {
         referenceGroups(starts: ArrayOrSingle<string> | ArrayOrSingle<Range>, parts: ReadonlyArray<ReferenceGroup>): void;
         singleReferenceGroup(definition: ReferencesDefinition, ranges?: Range[]): void;
         rangesAreOccurrences(isWriteAccess?: boolean, ranges?: Range[]): void;
-        rangesWithSameTextAreRenameLocations(): void;
+        rangesWithSameTextAreRenameLocations(...texts: string[]): void;
         rangesAreRenameLocations(options?: Range[] | { findInStrings?: boolean, findInComments?: boolean, ranges?: Range[] });
         findReferencesDefinitionDisplayPartsAtCaretAre(expected: ts.SymbolDisplayPart[]): void;
         noSignatureHelp(...markers: string[]): void;

tests/cases/fourslash/javaScriptClass2.ts

@@ -14,4 +14,4 @@
 //// var x = new Foo();
 //// x.[|union|];
 
-verify.rangesAreRenameLocations(test.rangesByText().get("union"));
+verify.rangesWithSameTextAreRenameLocations("union");

tests/cases/fourslash/jsxSpreadReference.ts

@@ -18,5 +18,4 @@
 //// var x = <MyClass {...[|n/*src*/n|]}></MyClass>;
 
 verify.goToDefinition("src", "dst");
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("nn");

tests/cases/fourslash/renameAcrossMultipleProjects.ts

@@ -11,5 +11,4 @@
 /////// <reference path="a.ts" />
 ////[|x|]++;
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("x");

tests/cases/fourslash/renameAlias.ts

@@ -4,5 +4,4 @@
 ////[|import [|{| "declarationRangeIndex": 0 |}M|] = SomeModule;|]
 ////import C = [|M|].SomeClass;
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("M");

tests/cases/fourslash/renameAlias2.ts

@@ -4,5 +4,4 @@
 ////import M = [|SomeModule|];
 ////import C = M.SomeClass;
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("SomeModule");

tests/cases/fourslash/renameAlias3.ts

@@ -4,5 +4,4 @@
 ////import M = SomeModule;
 ////import C = M.[|SomeClass|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("SomeClass");

tests/cases/fourslash/renameAliasExternalModule.ts

@@ -8,5 +8,4 @@
 ////[|import [|{| "declarationRangeIndex": 0 |}M|] = require("./a");|]
 ////import C = [|M|].SomeClass;
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("M");