From bbd2d00b351614151d64d375d311e423fb4ee4b9 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 31 May 2019 11:32:25 -0700 Subject: [PATCH] More tests --- tests/cases/fourslash/renameObjectSpread.ts | 6 +++--- tests/cases/fourslash/renameObjectSpreadAssignment.ts | 6 +++--- .../cases/fourslash/renameParameterPropertyDeclaration1.ts | 5 +++-- .../cases/fourslash/renameParameterPropertyDeclaration2.ts | 5 +++-- .../cases/fourslash/renameParameterPropertyDeclaration3.ts | 5 +++-- .../cases/fourslash/renameParameterPropertyDeclaration4.ts | 4 ++-- .../cases/fourslash/renameParameterPropertyDeclaration5.ts | 5 +++-- .../renamePropertyAccessExpressionHeritageClause.ts | 5 +++-- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/tests/cases/fourslash/renameObjectSpread.ts b/tests/cases/fourslash/renameObjectSpread.ts index f3af6e0280f..389de34cfc5 100644 --- a/tests/cases/fourslash/renameObjectSpread.ts +++ b/tests/cases/fourslash/renameObjectSpread.ts @@ -1,13 +1,13 @@ /// -////interface A1 { [|a|]: number }; -////interface A2 { [|a|]?: number }; +////interface A1 { [|[|{| "declarationRangeIndex": 0 |}a|]: number|] }; +////interface A2 { [|[|{| "declarationRangeIndex": 2 |}a|]?: number|] }; ////let a1: A1; ////let a2: A2; ////let a12 = { ...a1, ...a2 }; ////a12.[|a|]; -const [r0, r1, r2] = test.ranges(); +const [r0Def, r0, r1Def, r1, r2] = test.ranges(); // A1 unions with A2, so rename A1.a and a12.a verify.renameLocations(r0, [r0, r2]); // A1 unions with A2, so rename A2.a and a12.a diff --git a/tests/cases/fourslash/renameObjectSpreadAssignment.ts b/tests/cases/fourslash/renameObjectSpreadAssignment.ts index 9d55e43afa5..c326a38ce6c 100644 --- a/tests/cases/fourslash/renameObjectSpreadAssignment.ts +++ b/tests/cases/fourslash/renameObjectSpreadAssignment.ts @@ -2,10 +2,10 @@ ////interface A1 { a: number }; ////interface A2 { a?: number }; -////let [|a1|]: A1; -////let [|a2|]: A2; +////[|let [|{| "declarationRangeIndex": 0 |}a1|]: A1;|] +////[|let [|{| "declarationRangeIndex": 2 |}a2|]: A2;|] ////let a12 = { ...[|a1|], ...[|a2|] }; -const [r0, r1, r2, r3] = test.ranges(); +const [r0Def, r0, r1Def, r1, r2, r3] = test.ranges(); verify.rangesAreRenameLocations([r0, r2]); verify.rangesAreRenameLocations([r1, r3]); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts index 14f8a240bfb..90939afbaa0 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts @@ -1,10 +1,11 @@ /// //// class Foo { -//// constructor(private [|privateParam|]: number) { +//// constructor([|private [|{| "declarationRangeIndex": 0 |}privateParam|]: number|]) { //// let localPrivate = [|privateParam|]; //// this.[|privateParam|] += 10; //// } //// } -verify.rangesAreRenameLocations(); +const [rDef, ...rest] = test.ranges(); +verify.rangesAreRenameLocations(rest); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts index ce31ad6c9c5..a131106e4bf 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts @@ -1,10 +1,11 @@ /// //// class Foo { -//// constructor(public [|publicParam|]: number) { +//// constructor([|public [|{| "declarationRangeIndex": 0 |}publicParam|]: number|]) { //// let publicParam = [|publicParam|]; //// this.[|publicParam|] += 10; //// } //// } -verify.rangesAreRenameLocations(); +const [rDef, ...rest] = test.ranges(); +verify.rangesAreRenameLocations(rest); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts index 6291eff2605..73ab9b40c51 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts @@ -1,10 +1,11 @@ /// //// class Foo { -//// constructor(protected [|protectedParam|]: number) { +//// constructor([|protected [|{| "declarationRangeIndex": 0 |}protectedParam|]: number|]) { //// let protectedParam = [|protectedParam|]; //// this.[|protectedParam|] += 10; //// } //// } -verify.rangesAreRenameLocations(); +const [rDef, ...rest] = test.ranges(); +verify.rangesAreRenameLocations(rest); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts index 292c82a2d52..02cd24d64b5 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts @@ -1,10 +1,10 @@ /// //// class Foo { -//// constructor(protected { [|protectedParam|] }) { +//// constructor([|protected { [|{| "declarationRangeIndex": 0 |}protectedParam|] }|]) { //// let myProtectedParam = [|protectedParam|]; //// } //// } -const [r0, r1] = test.ranges(); +const [r0Def, r0, r1] = test.ranges(); verify.renameLocations([r0, r1], [{ range: r0, prefixText: "protectedParam: " }, r1]); diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts index f989e7c3fd9..f92fd53b6f9 100644 --- a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts +++ b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts @@ -1,9 +1,10 @@ /// //// class Foo { -//// constructor(protected [ [|protectedParam|] ]) { +//// constructor([|protected [ [|{| "declarationRangeIndex": 0 |}protectedParam|] ]|]) { //// let myProtectedParam = [|protectedParam|]; //// } //// } -verify.rangesAreRenameLocations(); +const [rDef, ...rest] = test.ranges(); +verify.rangesAreRenameLocations(rest); diff --git a/tests/cases/fourslash/renamePropertyAccessExpressionHeritageClause.ts b/tests/cases/fourslash/renamePropertyAccessExpressionHeritageClause.ts index 04b741a4b97..ae6a1c70b90 100644 --- a/tests/cases/fourslash/renamePropertyAccessExpressionHeritageClause.ts +++ b/tests/cases/fourslash/renamePropertyAccessExpressionHeritageClause.ts @@ -2,9 +2,10 @@ //// class B {} //// function foo() { -//// return {[|B|]: B}; +//// return {[|[|{| "declarationRangeIndex": 0 |}B|]: B|]}; //// } //// class C extends (foo()).[|B|] {} //// class C1 extends foo().[|B|] {} -verify.rangesAreRenameLocations(); \ No newline at end of file +const ranges = test.rangesByText(); +verify.rangesAreRenameLocations(ranges.get("B")); \ No newline at end of file