Skip to content

Commit c556962

Browse files
author
Andy Hanson
committed
Uncomment tests fixed with #23631
1 parent 4cf5774 commit c556962

6 files changed

+10
-23
lines changed

tests/cases/fourslash/genericFunctionReturnType.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
////var /*2*/r = foo(/*1*/1, "");
99
////var /*4*/r2 = r(/*3*/"");
1010

11-
// TODO: GH##23631
12-
// verify.signatureHelp({ marker: "1", text: "foo(x: number, y: string): (a: string) => number" });
11+
verify.signatureHelp({ marker: "1", text: "foo(x: number, y: string): (a: string) => number" });
1312

1413
verify.quickInfoAt("2", "var r: (a: string) => number");
1514

tests/cases/fourslash/genericFunctionSignatureHelp3.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,14 @@
1818

1919
verify.signatureHelp(
2020
{ marker: "1", text: "foo1(x: number, callback: (y1: {}) => number): void" },
21-
// TODO: GH#23631
22-
// { marker: "2", text: "foo2(x: number, callback: (y2: {}) => number): void" },
21+
{ marker: "2", text: "foo2(x: number, callback: (y2: {}) => number): void" },
2322
{ marker: "3", text: "callback(y3: {}): number" },
24-
// TODO: GH#23631
25-
// { marker: "4", text: "foo4(x: number, callback: (y4: string) => number): void" },
23+
{ marker: "4", text: "foo4(x: number, callback: (y4: string) => number): void" },
2624
{ marker: "5", text: "callback(y5: string): number" },
2725
);
2826

2927
goTo.marker('6');
30-
// TODO: GH#23631
31-
// verify.signatureHelp({ text: "foo6(x: number, callback: (y6: {}) => number): void" });
28+
verify.signatureHelp({ text: "foo6(x: number, callback: (y6: {}) => number): void" });
3229
edit.insert('string>(null,null);'); // need to make this line parse so we can get reasonable LS answers to later tests
3330

3431
verify.signatureHelp({ marker: "7", text: "foo7(x: number, callback: (y7: {}) => number): void" });

tests/cases/fourslash/genericParameterHelp.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
////testFunction<, ,/*5*/>(null, null, null);
1515

1616
verify.signatureHelp(
17-
// TODO: GH#23631
18-
/*
1917
{
2018
marker: "1",
2119
text: "testFunction<T extends IFoo, U, M extends IFoo>(a: T, b: U, c: M): M",
@@ -24,7 +22,6 @@ verify.signatureHelp(
2422
parameterSpan: "T extends IFoo",
2523
},
2624
{ marker: "2", parameterName: "U", parameterSpan: "U" },
27-
*/
2825
{ marker: "3", parameterName: "a", parameterSpan: "a: any" },
2926
{ marker: "4", parameterName: "M", parameterSpan: "M extends IFoo" },
3027
{ marker: "5", parameterName: "M", parameterSpan: "M extends IFoo" },

tests/cases/fourslash/genericParameterHelpConstructorCalls.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
////new testClass<IFoo,/*constructor5*/IFoo,IFoo>(null, null, null)
1515

1616
verify.signatureHelp(
17-
// TODO: GH#23631
18-
/*
1917
{
2018
marker: "constructor1",
2119
text: "testClass<T extends IFoo, U, M extends IFoo>(a: T, b: U, c: M): testClass<T, U, M>",
@@ -27,8 +25,7 @@ verify.signatureHelp(
2725
parameterName: "U",
2826
parameterSpan: "U",
2927
},
30-
*/
31-
{ marker: "constructor3", parameterName: "T", parameterSpan: "T extends IFoo" },
32-
{ marker: "constructor4", parameterName: "M", parameterSpan: "M extends IFoo" },
33-
{ marker: "constructor5", parameterName: "U", parameterSpan: "U" },
28+
{ marker: "constructor3", parameterName: "T", parameterSpan: "T extends IFoo" },
29+
{ marker: "constructor4", parameterName: "M", parameterSpan: "M extends IFoo" },
30+
{ marker: "constructor5", parameterName: "U", parameterSpan: "U" },
3431
);

tests/cases/fourslash/genericParameterHelpTypeReferences.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
////class Bar<T> extends testClass</*type3*/
1313
////var x : testClass<,, /*type4*/any>;
1414

15-
// TODO: GH#23631
15+
// TODO: GH#26699
1616

1717
if (false) {
1818
verify.signatureHelp(

tests/cases/fourslash/staticGenericOverloads1.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313

1414
verify.signatureHelp({ marker: "", overloadsCount: 2 });
1515
edit.insert('a');
16-
verify.signatureHelp({ overloadsCount: 2 });
17-
// TODO: GH#23631
18-
// verify.signatureHelp({ text: "B(v: A<number>): A<number>" });
16+
verify.signatureHelp({ overloadsCount: 2, text: "B(v: A<number>): A<number>" });
1917
edit.insert('); A.B(');
2018
verify.signatureHelp({ overloadsCount: 2, text: "B(v: A<{}>): A<{}>" });
2119
edit.insert('a');
22-
// TODO: GH#23631
23-
// verify.signatureHelp({ text: "B(v: A<number>): A<number>" });
20+
verify.signatureHelp({ overloadsCount: 2, text: "B(v: A<number>): A<number>" });

0 commit comments

Comments
 (0)