Skip to content

Commit 018026a

Browse files
committed
More tests
1 parent e4a2dd5 commit 018026a

31 files changed

+96
-97
lines changed

tests/cases/fourslash/ambientShorthandFindAllRefs.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
////declare module "jquery";
55

66
// @Filename: user.ts
7-
////import {[|{| "isWriteAccess": true, "isDefinition": true |}x|]} from "jquery";
7+
////[|import {[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}x|]} from "jquery";|]
88

99
// @Filename: user2.ts
10-
////import {[|{| "isWriteAccess": true, "isDefinition": true |}x|]} from "jquery";
10+
////[|import {[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}x|]} from "jquery";|]
1111

12-
const ranges = test.ranges();
13-
const [r0, r1] = ranges;
12+
const [r0Def, r0, r1Def, r1] = test.ranges();
1413
// TODO: Want these to be in the same group, but that would require creating a symbol for `x`.
1514
verify.singleReferenceGroup("(alias) module \"jquery\"\nimport x", [r0]);
1615
verify.singleReferenceGroup("(alias) module \"jquery\"\nimport x", [r1]);

tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
////
88
//// }
99
////
10-
//// public /**/[|{| "isWriteAccess": true, "isDefinition": true |}start|](){
10+
//// [|public /**/[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}start|](){
1111
//// return this;
12-
//// }
12+
//// }|]
1313
////
1414
//// public stop(){
1515
//// return this;
@@ -33,5 +33,5 @@ cancellation.resetCancelled();
3333
checkRefs();
3434

3535
function checkRefs() {
36-
verify.singleReferenceGroup("(method) Test.start(): this");
36+
verify.singleReferenceGroup("(method) Test.start(): this", "start");
3737
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/// <reference path='fourslash.ts'/>
22

33
// @Filename: fileA.ts
4-
//// export function [|__foo|]() {
5-
//// }
4+
//// [|export function [|{| "declarationRangeIndex": 0 |}__foo|]() {
5+
//// }|]
66
////
77
// @Filename: fileB.ts
8-
//// import { [|__foo|] as bar } from "./fileA";
8+
//// [|import { [|{| "declarationRangeIndex": 2 |}__foo|] as bar } from "./fileA";|]
99
////
1010
//// bar();
1111

12-
verify.rangesAreRenameLocations();
12+
verify.rangesWithSameTextAreRenameLocations("__foo");

tests/cases/fourslash/duplicatePackageServices.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
// @noImplicitReferences: true
33

44
// @Filename: /node_modules/a/index.d.ts
5-
////import [|{| "name": "useAX", "isWriteAccess": true, "isDefinition": true |}X|] from "x";
5+
////[|import [|{| "name": "useAX", "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}X|] from "x";|]
66
////export function a(x: [|X|]): void;
77

88
// @Filename: /node_modules/a/node_modules/x/index.d.ts
9-
////export default class /*defAX*/[|{| "isWriteAccess": true, "isDefinition": true |}X|] {
9+
////[|export default class /*defAX*/[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 3 |}X|] {
1010
//// private x: number;
11-
////}
11+
////}|]
1212

1313
// @Filename: /node_modules/a/node_modules/x/package.json
1414
////{ "name": "x", "version": "1.2.3" }
1515

1616
// @Filename: /node_modules/b/index.d.ts
17-
////import [|{| "name": "useBX", "isWriteAccess": true, "isDefinition": true |}X|] from "x";
17+
////[|import [|{| "name": "useBX", "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 5 |}X|] from "x";|]
1818
////export const b: [|X|];
1919

2020
// @Filename: /node_modules/b/node_modules/x/index.d.ts
21-
////export default class /*defBX*/[|{| "isWriteAccess": true, "isDefinition": true |}X|] {
21+
////[|export default class /*defBX*/[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 8 |}X|] {
2222
//// private x: number;
23-
////}
23+
////}|]
2424

2525
// @Filename: /node_modules/b/node_modules/x/package.json
2626
////{ "name": "x", "version": "1.2.3" }
@@ -35,7 +35,7 @@ verify.numberOfErrorsInCurrentFile(0);
3535
verify.goToDefinition("useAX", "defAX");
3636
verify.goToDefinition("useBX", "defAX");
3737

38-
const [r0, r1, r2, r3, r4, r5] = test.ranges();
38+
const [r0Def, r0, r1, r2Def, r2, r3Def, r3, r4, r5Def, r5] = test.ranges();
3939
const aImport = { definition: "(alias) class X\nimport X", ranges: [r0, r1] };
4040
const def = { definition: "class X", ranges: [r2] };
4141
const bImport = { definition: "(alias) class X\nimport X", ranges: [r3, r4] };

tests/cases/fourslash/esModuleInteropFindAllReferences.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
// @Filename: /abc.d.ts
66
////declare module "a" {
7-
//// export const [|{| "isWriteAccess": true, "isDefinition": true |}x|]: number;
7+
//// [|export const [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}x|]: number;|]
88
////}
99

1010
// @Filename: /b.ts
1111
////import a from "a";
1212
////a.[|x|];
1313

14-
verify.singleReferenceGroup("const x: number");
14+
verify.singleReferenceGroup("const x: number", "x");

tests/cases/fourslash/esModuleInteropFindAllReferences2.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
// @Filename: /a.d.ts
88
////export as namespace abc;
9-
////export const [|{| "isWriteAccess": true, "isDefinition": true |}x|]: number;
9+
////[|export const [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}x|]: number;|]
1010

1111
// @Filename: /b.ts
1212
////import a from "./a";
1313
////a.[|x|];
1414

15-
verify.singleReferenceGroup('const x: number');
15+
verify.singleReferenceGroup('const x: number', "x");

tests/cases/fourslash/findAllReferPropertyAccessExpressionHeritageClause.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
//// class B {}
44
//// function foo() {
5-
//// return {[|{| "isWriteAccess": true, "isDefinition": true |}B|]: B};
5+
//// return {[|[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}B|]: B|]};
66
//// }
77
//// class C extends (foo()).[|B|] {}
88
//// class C1 extends foo().[|B|] {}
99

10-
verify.singleReferenceGroup("(property) B: typeof B");
10+
verify.singleReferenceGroup("(property) B: typeof B", "B");
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/// <reference path='fourslash.ts' />
22

33
// @Filename: foo.ts
4-
//// export function [|{| "isWriteAccess": true, "isDefinition": true |}bar|]() { return "bar"; }
4+
//// [|export function [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}bar|]() { return "bar"; }|]
55

66
//// var x = import("./foo");
77
//// x.then(foo => {
88
//// foo.[|bar|]();
99
//// })
1010

11-
verify.singleReferenceGroup("function bar(): string");
12-
verify.rangesAreRenameLocations();
11+
verify.singleReferenceGroup("function bar(): string", "bar");
12+
verify.rangesWithSameTextAreRenameLocations("bar");

tests/cases/fourslash/findAllReferencesDynamicImport3.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/// <reference path='fourslash.ts' />
22

33
// @Filename: foo.ts
4-
////export function [|{| "isWriteAccess": true, "isDefinition": true |}bar|]() { return "bar"; }
5-
////import('./foo').then(({ [|{| "isWriteAccess": true, "isDefinition": true |}bar|] }) => undefined);
4+
////[|export function [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}bar|]() { return "bar"; }|]
5+
////import('./foo').then(([|{ [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}bar|] }|]) => undefined);
66

7-
const [r0, r1] = test.ranges();
7+
const [r0Def, r0, r1Def, r1] = test.ranges();
88
verify.referenceGroups(r0, [{ definition: "function bar(): string", ranges: [r0, r1] }]);
99
verify.referenceGroups(r1, [
1010
{ definition: "function bar(): string", ranges: [r0] },
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
///<reference path="fourslash.ts" />
22
// @allowJs: true
33
// @Filename: Foo.js
4-
/////** @type {function ([|{|"isWriteAccess": true, "isDefinition": true|}new|]: string, string): string} */
4+
/////** @type {function ([|[|{|"isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0|}new|]: string|], string): string} */
55
////var f;
66

7-
const [a0] = test.ranges();
7+
const [a0Def, a0] = test.ranges();
88
verify.singleReferenceGroup("(parameter) new: string", [a0]);

0 commit comments

Comments
 (0)