Skip to content

Commit 7b06658

Browse files
Andysandersn
Andy
authored and
sandersn
committed
Combine signatureHelp testing methods (#24132)
1 parent 1f61e06 commit 7b06658

File tree

136 files changed

+1306
-1583
lines changed

Some content is hidden

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

136 files changed

+1306
-1583
lines changed

‎src/harness/fourslash.ts

Lines changed: 120 additions & 139 deletions
Large diffs are not rendered by default.

‎tests/cases/fourslash/augmentedTypesModule2.ts

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

33
////function /*11*/m2f(x: number) { };
4-
////namespace m2f { export interface I { foo(): void } }
4+
////namespace m2f { export interface I { foo(): void } }
55
////var x: m2f./*1*/
66
////var /*2*/r = m2f/*3*/;
77

@@ -18,4 +18,4 @@ verify.quickInfoAt("2", "var r: (x: number) => void");
1818

1919
goTo.marker('3');
2020
edit.insert('(');
21-
verify.currentSignatureHelpIs('m2f(x: number): void');
21+
verify.signatureHelp({ text: "m2f(x: number): void" });

‎tests/cases/fourslash/augmentedTypesModule3.ts

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

33
////function m2g() { };
4-
////module m2g { export class C { foo(x: number) { } } }
4+
////module m2g { export class C { foo(x: number) { } } }
55
////var x: m2g./*1*/;
66
////var /*2*/r = m2g/*3*/;
77

@@ -16,4 +16,4 @@ verify.quickInfoAt("2", "var r: typeof m2g");
1616

1717
goTo.marker('3');
1818
edit.insert('(');
19-
verify.currentSignatureHelpIs('m2g(): void');
19+
verify.signatureHelp({ text: "m2g(): void" });

‎tests/cases/fourslash/augmentedTypesModule6.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ edit.insert('I;');
1313

1414
verify.completions({ marker: "2", includes: "m3f" });
1515

16-
goTo.marker('3');
17-
verify.currentSignatureHelpIs('m3f(): m3f');
16+
verify.signatureHelp({ marker: "3", text: "m3f(): m3f" });
1817

1918
verify.quickInfoAt("4", "var r: m3f");
2019

@@ -23,4 +22,4 @@ edit.insert('foo(1)');
2322

2423
verify.completions({ marker: "6", includes: "foo" });
2524
edit.insert('foo(');
26-
verify.currentSignatureHelpIs('foo(): void');
25+
verify.signatureHelp({ text: "foo(): void" });

‎tests/cases/fourslash/callSignatureHelp.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
////var c: C;
77
////c(/**/
88

9-
goTo.marker();
10-
verify.currentSignatureHelpIs('c(): number');
9+
verify.signatureHelp({ marker: "", text: "c(): number" });

‎tests/cases/fourslash/classExtendsInterfaceSigHelp1.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
////var i: I;
1414
////i.foo(/**/
1515

16-
goTo.marker();
17-
verify.signatureHelpCountIs(2);
18-
verify.currentParameterSpanIs('x: string');
16+
verify.signatureHelp({
17+
marker: "",
18+
overloadsCount: 2,
19+
parameterSpan: "x: string",
20+
});

‎tests/cases/fourslash/commentsClass.ts

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
////var i6/*24*/_c = c/*25*/6;
3939
/////*26*/
4040
////class a {
41-
//// /**
41+
//// /**
4242
//// constructor for a
4343
//// @param a this is my a
4444
//// */
@@ -63,8 +63,7 @@ verify.quickInfos({
6363
2: "var i2: c2"
6464
});
6565

66-
goTo.marker('3');
67-
verify.currentSignatureHelpDocCommentIs("");
66+
verify.signatureHelp({ marker: "3", docComment: "" });
6867

6968
verify.quickInfos({
7069
4: "var i2_c: typeof c2",
@@ -73,8 +72,7 @@ verify.quickInfos({
7372
7: "var i3: c3"
7473
});
7574

76-
goTo.marker('8');
77-
verify.currentSignatureHelpDocCommentIs("Constructor comment");
75+
verify.signatureHelp({ marker: "8", docComment: "Constructor comment" });
7876

7977
verify.quickInfos({
8078
9: "var i3_c: typeof c3",
@@ -83,8 +81,7 @@ verify.quickInfos({
8381
12: "var i4: c4"
8482
});
8583

86-
goTo.marker('13');
87-
verify.currentSignatureHelpDocCommentIs("Constructor comment");
84+
verify.signatureHelp({ marker: "13", docComment: "Constructor comment" });
8885

8986
verify.quickInfos({
9087
14: "var i4_c: typeof c4",
@@ -93,8 +90,7 @@ verify.quickInfos({
9390
17: "var i5: c5"
9491
});
9592

96-
goTo.marker('18');
97-
verify.currentSignatureHelpDocCommentIs("");
93+
verify.signatureHelp({ marker: "18", docComment: "" });
9894

9995
verify.quickInfos({
10096
19: "var i5_c: typeof c5",
@@ -103,8 +99,7 @@ verify.quickInfos({
10399
22: "var i6: c6"
104100
});
105101

106-
goTo.marker('23');
107-
verify.currentSignatureHelpDocCommentIs("constructor comment");
102+
verify.signatureHelp({ marker: "23", docComment: "constructor comment" });
108103

109104
verify.quickInfos({
110105
24: "var i6_c: typeof c6",
@@ -128,9 +123,12 @@ verify.completionListContains("c6", "class c6", "class with statics and construc
128123
verify.completionListContains("i6", "var i6: c6", "");
129124
verify.completionListContains("i6_c", "var i6_c: typeof c6", "");
130125

131-
goTo.marker('27');
132-
verify.currentSignatureHelpDocCommentIs("constructor for a");
133-
verify.currentParameterHelpArgumentDocCommentIs("this is my a");
126+
verify.signatureHelp({
127+
marker: "27",
128+
docComment: "constructor for a",
129+
parameterDocComment: "this is my a",
130+
tags: [{ name: "param", text: "a this is my a" }],
131+
});
134132

135133
verify.quickInfos({
136134
28: "constructor c2(): c2",

‎tests/cases/fourslash/commentsClassMembers.ts

Lines changed: 17 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,7 @@ verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
171171
verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
172172
verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
173173

174-
goTo.marker('8');
175-
verify.currentSignatureHelpDocCommentIs("sum with property");
176-
verify.currentParameterHelpArgumentDocCommentIs("number to add");
174+
verify.signatureHelp({ marker: "8", docComment: "sum with property", parameterDocComment: "number to add" });
177175
verify.quickInfoAt("8q", "(method) c1.p2(b: number): number", "sum with property");
178176

179177
goTo.marker('9');
@@ -220,9 +218,7 @@ verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
220218
verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
221219
verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
222220

223-
goTo.marker('13');
224-
verify.currentSignatureHelpDocCommentIs("sum with property");
225-
verify.currentParameterHelpArgumentDocCommentIs("number to add");
221+
verify.signatureHelp({ marker: "13", docComment: "sum with property", parameterDocComment: "number to add" });
226222
verify.completionListContains("value", "(parameter) value: number", "this is value");
227223

228224
verify.quickInfos({
@@ -264,9 +260,7 @@ verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
264260
verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
265261
verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
266262

267-
goTo.marker('20');
268-
verify.currentSignatureHelpDocCommentIs("sum with property");
269-
verify.currentParameterHelpArgumentDocCommentIs("number to add");
263+
verify.signatureHelp({ marker: "20", docComment: "sum with property", parameterDocComment: "number to add" });
270264
verify.quickInfoAt("20q", "(method) c1.pp2(b: number): number", "sum with property");
271265

272266
goTo.marker('21');
@@ -313,9 +307,7 @@ verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
313307
verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
314308
verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
315309

316-
goTo.marker('25');
317-
verify.currentSignatureHelpDocCommentIs("sum with property");
318-
verify.currentParameterHelpArgumentDocCommentIs("number to add");
310+
verify.signatureHelp({ marker: "25", docComment: "sum with property", parameterDocComment: "number to add" });
319311
verify.completionListContains("value", "(parameter) value: number", "this is value");
320312

321313
verify.quickInfos({
@@ -352,9 +344,7 @@ verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
352344
verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
353345
verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");
354346

355-
goTo.marker('35');
356-
verify.currentSignatureHelpDocCommentIs("static sum with property");
357-
verify.currentParameterHelpArgumentDocCommentIs("number to add");
347+
verify.signatureHelp({ marker: "35", docComment: "static sum with property", parameterDocComment: "number to add" });
358348
verify.completionListContains("c1", "class c1", "This is comment for c1");
359349
verify.quickInfoAt("35q", "(method) c1.s2(b: number): number", "static sum with property");
360350

@@ -390,9 +380,7 @@ verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
390380
verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
391381
verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");
392382

393-
goTo.marker('42');
394-
verify.currentSignatureHelpDocCommentIs("static sum with property");
395-
verify.currentParameterHelpArgumentDocCommentIs("number to add");
383+
verify.signatureHelp({ marker: "42", docComment: "static sum with property", parameterDocComment: "number to add" });
396384
verify.completionListContains("value", "(parameter) value: number", "this is value");
397385
verify.quickInfos({
398386
"42q": ["(method) c1.s2(b: number): number", "static sum with property"],
@@ -405,17 +393,13 @@ verify.completionListContains("b", "(parameter) b: number", "");
405393

406394
verify.quickInfoAt("46", "(property) c1.nc_p3: number");
407395

408-
goTo.marker('47');
409-
verify.currentSignatureHelpDocCommentIs("");
410-
verify.currentParameterHelpArgumentDocCommentIs("");
396+
verify.signatureHelp({ marker: "47", docComment: "" });
411397
verify.quickInfos({
412398
"47q": "(method) c1.nc_p2(b: number): number",
413399
48: "(property) c1.nc_p3: number"
414400
});
415401

416-
goTo.marker('49');
417-
verify.currentSignatureHelpDocCommentIs("");
418-
verify.currentParameterHelpArgumentDocCommentIs("");
402+
verify.signatureHelp({ marker: "49", docComment: "" });
419403
verify.completionListContains("value", "(parameter) value: number", "");
420404
verify.quickInfos({
421405
"49q": "(method) c1.nc_p2(b: number): number",
@@ -428,17 +412,13 @@ verify.completionListContains("b", "(parameter) b: number", "");
428412

429413
verify.quickInfoAt("53", "(property) c1.nc_pp3: number");
430414

431-
goTo.marker('54');
432-
verify.currentSignatureHelpDocCommentIs("");
433-
verify.currentParameterHelpArgumentDocCommentIs("");
415+
verify.signatureHelp({ marker: "54", docComment: "" });
434416
verify.quickInfos({
435417
"54q": "(method) c1.nc_pp2(b: number): number",
436418
55: "(property) c1.nc_pp3: number"
437419
});
438420

439-
goTo.marker('56');
440-
verify.currentSignatureHelpDocCommentIs("");
441-
verify.currentParameterHelpArgumentDocCommentIs("");
421+
verify.signatureHelp({ marker: "56", docComment: "" });
442422
verify.completionListContains("value", "(parameter) value: number", "");
443423
verify.quickInfos({
444424
"56q": "(method) c1.nc_pp2(b: number): number",
@@ -451,25 +431,20 @@ verify.completionListContains("b", "(parameter) b: number", "");
451431

452432
verify.quickInfoAt("60", "(property) c1.nc_s3: number");
453433

454-
goTo.marker('61');
455-
verify.currentSignatureHelpDocCommentIs("");
456-
verify.currentParameterHelpArgumentDocCommentIs("");
434+
verify.signatureHelp({ marker: "61", docComment: "" });
457435
verify.quickInfos({
458436
"61q": "(method) c1.nc_s2(b: number): number",
459437
62: "(property) c1.nc_s3: number"
460438
});
461439

462-
goTo.marker('63');
463-
verify.currentSignatureHelpDocCommentIs("");
464-
verify.currentParameterHelpArgumentDocCommentIs("");
440+
verify.signatureHelp({ marker: "63", docComment: "" });
465441
verify.completionListContains("value", "(parameter) value: number", "");
466442
verify.quickInfos({
467443
"63q": "(method) c1.nc_s2(b: number): number",
468444
64: "var i1: c1"
469445
});
470446

471-
goTo.marker('65');
472-
verify.currentSignatureHelpDocCommentIs("Constructor method");
447+
verify.signatureHelp({ marker: "65", docComment: "Constructor method" });
473448
verify.quickInfos({
474449
"65q": ["constructor c1(): c1", "Constructor method"],
475450
66: "var i1_p: number"
@@ -490,9 +465,7 @@ verify.quickInfos({
490465
70: "var i1_r: number"
491466
});
492467

493-
goTo.marker('71');
494-
verify.currentSignatureHelpDocCommentIs("sum with property");
495-
verify.currentParameterHelpArgumentDocCommentIs("number to add");
468+
verify.signatureHelp({ marker: "71", docComment: "sum with property", parameterDocComment: "number to add" });
496469

497470
verify.quickInfos({
498471
"71q": ["(method) c1.p2(b: number): number", "sum with property"],
@@ -507,9 +480,7 @@ verify.quickInfos({
507480
80: "var i1_ncr: number"
508481
});
509482

510-
goTo.marker('81');
511-
verify.currentSignatureHelpDocCommentIs("");
512-
verify.currentParameterHelpArgumentDocCommentIs("");
483+
verify.signatureHelp({ marker: "81", docComment: "" });
513484

514485
verify.quickInfos({
515486
"81q": "(method) c1.nc_p2(b: number): number",
@@ -539,9 +510,7 @@ verify.quickInfos({
539510
91: "var i1_s_r: number"
540511
});
541512

542-
goTo.marker('92');
543-
verify.currentSignatureHelpDocCommentIs("static sum with property");
544-
verify.currentParameterHelpArgumentDocCommentIs("number to add");
513+
verify.signatureHelp({ marker: "92", docComment: "static sum with property", parameterDocComment: "number to add" });
545514

546515
verify.quickInfos({
547516
"92q": ["(method) c1.s2(b: number): number", "static sum with property"],
@@ -556,9 +525,7 @@ verify.quickInfos({
556525
101: "var i1_s_ncr: number"
557526
});
558527

559-
goTo.marker('102');
560-
verify.currentSignatureHelpDocCommentIs("");
561-
verify.currentParameterHelpArgumentDocCommentIs("");
528+
verify.signatureHelp({ marker: "102", docComment: "" });
562529
verify.quickInfos({
563530
"102q": "(method) c1.nc_s2(b: number): number",
564531
103: "var i1_s_ncprop: number",

0 commit comments

Comments
 (0)