Skip to content

Commit e1e1603

Browse files
committed
More tests
1 parent d1dc837 commit e1e1603

File tree

51 files changed

+182
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+182
-184
lines changed
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
/// <reference path='fourslash.ts'/>
22

33
////interface I {
4-
//// ["[|{| "isDefinition": true |}prop1|]"]: () => void;
4+
//// [|["[|{| "isDefinition": true, "declarationRangeIndex": 0 |}prop1|]"]: () => void;|]
55
////}
66
////
77
////class C implements I {
8-
//// ["[|{| "isDefinition": true |}prop1|]"]: any;
8+
//// [|["[|{| "isDefinition": true, "declarationRangeIndex": 2 |}prop1|]"]: any;|]
99
////}
1010
////
1111
////var x: I = {
12-
//// ["[|{| "isWriteAccess": true, "isDefinition": true |}prop1|]"]: function () { },
12+
//// [|["[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 4 |}prop1|]"]: function () { }|],
1313
////}
1414

15-
const ranges = test.ranges();
16-
const [r0, r1, r2] = ranges;
17-
verify.referenceGroups(ranges, [
15+
const [r0Def, r0, r1Def, r1, r2Def, r2] = test.ranges();
16+
verify.referenceGroups([r0, r1, r2], [
1817
{ definition: { text: '(property) I["prop1"]: () => void', range: r0 }, ranges: [r0, r2] },
1918
{ definition: { text: '(property) C["prop1"]: any', range: r1 }, ranges: [r1] },
2019
]);
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
/// <reference path='fourslash.ts'/>
22

33
////interface I {
4-
//// [[|{| "isDefinition": true |}42|]](): void;
4+
//// [|[[|{| "isDefinition": true, "declarationRangeIndex": 0 |}42|]](): void;|]
55
////}
66
////
77
////class C implements I {
8-
//// [[|{| "isDefinition": true |}42|]]: any;
8+
//// [|[[|{| "isDefinition": true, "declarationRangeIndex": 2 |}42|]]: any;|]
99
////}
1010
////
1111
////var x: I = {
12-
//// ["[|{| "isWriteAccess": true, "isDefinition": true |}42|]"]: function () { }
12+
//// [|["[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 4 |}42|]"]: function () { }|]
1313
////}
1414

15-
const ranges = test.ranges();
16-
const [r0, r1, r2] = ranges;
17-
verify.referenceGroups(ranges, [
15+
const [r0Def, r0, r1Def, r1, r2Def, r2] = test.ranges();
16+
verify.referenceGroups([r0, r1, r2], [
1817
{ definition: { text: '(method) I[42](): void', range: r0 }, ranges: [r0, r2] },
1918
{ definition: { text: '(property) C[42]: any', range: r1 }, ranges: [r1] },
2019
]);

tests/cases/fourslash/findAllRefsForDefaultExport.ts

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

33
// @Filename: a.ts
4-
////export default function /*def*/[|{| "isWriteAccess": true, "isDefinition": true |}f|]() {}
4+
////[|export default function /*def*/[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}f|]() {}|]
55

66
// @Filename: b.ts
7-
////import [|{| "isWriteAccess": true, "isDefinition": true |}g|] from "./a";
7+
////[|import [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}g|] from "./a";|]
88
////[|/*ref*/g|]();
99

1010
// @Filename: c.ts
1111
////import { f } from "./a";
1212

13-
const ranges = test.ranges();
14-
const [r0, r1, r2] = ranges;
13+
const [r0Def, r0, r1Def, r1, r2] = test.ranges();
1514
verify.referenceGroups(r0, [
1615
{ definition: "function f(): void", ranges: [r0] },
1716
{ definition: "(alias) function g(): void\nimport g", ranges: [r1, r2] }
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/// <reference path='fourslash.ts'/>
22

3-
////export default class [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedClass|] {
4-
////}
3+
////[|export default class [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}DefaultExportedClass|] {
4+
////}|]
55
////
66
////var x: [|DefaultExportedClass|];
77
////
88
////var y = new [|DefaultExportedClass|];
99

10-
verify.singleReferenceGroup("class DefaultExportedClass");
10+
verify.singleReferenceGroup("class DefaultExportedClass", "DefaultExportedClass");

tests/cases/fourslash/findAllRefsForDefaultExport02.ts

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

3-
////export default function [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedFunction|]() {
3+
////[|export default function [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}DefaultExportedFunction|]() {
44
//// return [|DefaultExportedFunction|];
5-
////}
5+
////}|]
66
////
77
////var x: typeof [|DefaultExportedFunction|];
88
////
99
////var y = [|DefaultExportedFunction|]();
1010
////
11-
////namespace [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedFunction|] {
12-
////}
11+
////[|namespace [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 5 |}DefaultExportedFunction|] {
12+
////}|]
1313

1414

15-
const ranges = test.ranges();
16-
const [r0, r1, r2, r3, r4] = ranges;
15+
const [r0Def, r0, r1, r2, r3, r4Def, r4] = test.ranges();
1716
const fnRanges = [r0, r1, r2, r3];
1817
verify.singleReferenceGroup("function DefaultExportedFunction(): () => typeof DefaultExportedFunction", fnRanges);
1918

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

3-
////function [|{| "isWriteAccess": true, "isDefinition": true |}f|]() {
3+
////[|function [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}f|]() {
44
//// return 100;
5-
////}
5+
////}|]
66
////
7-
////export default [|f|];
7+
////[|export default [|{| "declarationRangeIndex": 2 |}f|];|]
88
////
99
////var x: typeof [|f|];
1010
////
1111
////var y = [|f|]();
1212
////
13-
////namespace [|{| "isWriteAccess": true, "isDefinition": true |}f|] {
13+
////[|namespace [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 6 |}f|] {
1414
//// var local = 100;
15-
////}
15+
////}|]
1616

17-
verify.singleReferenceGroup("namespace f\nfunction f(): number");
17+
verify.singleReferenceGroup("namespace f\nfunction f(): number", "f");

tests/cases/fourslash/findAllRefsForDefaultExport08.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
////
88
////var y = new DefaultExportedClass;
99
////
10-
////namespace [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedClass|] {
11-
////}
10+
////[|namespace [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}DefaultExportedClass|] {
11+
////}|]
1212

1313
verify.noErrors();
1414

1515
// The namespace and class do not merge,
1616
// so the namespace should be all alone.
17-
verify.singleReferenceGroup("class DefaultExportedClass\nnamespace DefaultExportedClass");
17+
verify.singleReferenceGroup("class DefaultExportedClass\nnamespace DefaultExportedClass", "DefaultExportedClass");

tests/cases/fourslash/findAllRefsForDefaultExport_reExport.ts

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

33
// @Filename: /export.ts
4-
////const [|{| "isWriteAccess": true, "isDefinition": true |}foo|] = 1;
5-
////export default [|foo|];
4+
////[|const [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}foo|] = 1;|]
5+
////[|export default [|{| "declarationRangeIndex": 2 |}foo|];|]
66

77
// @Filename: /re-export.ts
8-
////export { [|{| "isWriteAccess": true, "isDefinition": true |}default|] } from "./export";
8+
////[|export { [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 4 |}default|] } from "./export";|]
99

1010
// @Filename: /re-export-dep.ts
11-
////import [|{| "isWriteAccess": true, "isDefinition": true |}fooDefault|] from "./re-export";
11+
////[|import [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 6 |}fooDefault|] from "./re-export";|]
1212

13-
const [r0, r1, r2, r3] = test.ranges();
13+
const [r0Def, r0, r1Def, r1, r2Def, r2, r3Def, r3] = test.ranges();
1414
verify.referenceGroups([r0, r1], [
1515
{ definition: "const foo: 1", ranges: [r0, r1] },
1616
{ definition: "(alias) const foo: 1\nexport default", ranges: [r2], },

tests/cases/fourslash/findAllRefsForDefaultExport_reExport_allowSyntheticDefaultImports.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
// @allowSyntheticDefaultImports: true
44

55
// @Filename: /export.ts
6-
////const [|{| "isWriteAccess": true, "isDefinition": true |}foo|] = 1;
7-
////export = [|foo|];
6+
////[|const [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}foo|] = 1;|]
7+
////[|export = [|{| "declarationRangeIndex": 2 |}foo|];|]
88

99
// @Filename: /re-export.ts
10-
////export { [|{| "isWriteAccess": true, "isDefinition": true |}default|] } from "./export";
10+
////[|export { [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 4 |}default|] } from "./export";|]
1111

1212
// @Filename: /re-export-dep.ts
13-
////import [|{| "isWriteAccess": true, "isDefinition": true |}fooDefault|] from "./re-export";
13+
////[|import [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 6 |}fooDefault|] from "./re-export";|]
1414

1515
verify.noErrors();
1616

17-
const [r0, r1, r2, r3] = test.ranges();
17+
const [r0Def, r0, r1Def, r1, r2Def, r2, r3Def, r3] = test.ranges();
1818
verify.referenceGroups([r0, r1], [
1919
{ definition: "const foo: 1", ranges: [r0, r1] },
2020
{ definition: "(alias) const foo: 1\nexport default", ranges: [r2], },
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: file1.ts
4-
////var foo = function [|{| "isWriteAccess": true, "isDefinition": true |}foo|](a = [|foo|](), b = () => [|foo|]) {
4+
////var foo = [|function [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}foo|](a = [|foo|](), b = () => [|foo|]) {
55
//// [|foo|]([|foo|], [|foo|]);
6-
////}
6+
////}|]
77

88
// @Filename: file2.ts
99
/////// <reference path="file1.ts" />
1010
////foo();
1111

12-
verify.singleReferenceGroup("(local function) foo(a?: void, b?: () => (a?: void, b?: ...) => void): void");
12+
verify.singleReferenceGroup("(local function) foo(a?: void, b?: () => (a?: void, b?: ...) => void): void", "foo");

0 commit comments

Comments
 (0)