microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-13 14:09:06 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fixed the + overload according to feedback

Browse Source
This commit is contained in:
Sheetal Nandi
2014-10-07 17:06:34 -07:00
parent d4e58b2fd9
commit 0fbf73a02a
6 changed files with 127 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/services.ts
View File

@@ -2717,7 +2717,7 @@ module ts {
}
callExpression = <CallExpression>location.parent;
var candidateSignatures = <Signature[]>[];
var candidateSignatures: Signature[] = [];
signature = typeResolver.getResolvedSignature(callExpression, candidateSignatures);
if (!signature && candidateSignatures.length) {
// Use the first candidate:
@@ -2934,13 +2934,9 @@ module ts {
displayParts.push(spacePart());
displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
displayParts.push(operatorPart(SyntaxKind.PlusToken));
displayParts.push(spacePart());
displayParts.push(displayPart((allSignatures.length - 1).toString(), SymbolDisplayPartKind.numericLiteral));
displayParts.push(spacePart());
displayParts.push(textPart("overload"));
displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));
displayParts.push(textPart("s"));
displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
displayParts.push(textPart(allSignatures.length === 2 ? "overload" : "overloads"));
displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
}
documentation = signature.getDocumentationComment();

6
tests/cases/fourslash/commentsCommentParsing.ts
View File

@@ -334,7 +334,7 @@ goTo.marker('25');
verify.currentSignatureHelpDocCommentIs("fn f1 with number");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('25q');
verify.quickInfoIs("(function) f1(a: number): any (+ 1 overload(s))", "fn f1 with number");
verify.quickInfoIs("(function) f1(a: number): any (+1 overload)", "fn f1 with number");
goTo.marker('25aq');
verify.quickInfoIs("(parameter) a: number", "");
@@ -342,13 +342,13 @@ goTo.marker('26');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('26q');
verify.quickInfoIs("(function) f1(b: string): any (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f1(b: string): any (+1 overload)", "");
goTo.marker('26aq');
verify.quickInfoIs("(parameter) b: string", "");
goTo.marker('27');
verify.completionListContains("multiply", "(function) multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
verify.completionListContains("f1", "(function) f1(a: number): any (+ 1 overload(s))", "fn f1 with number");
verify.completionListContains("f1", "(function) f1(a: number): any (+1 overload)", "fn f1 with number");
goTo.marker('28');
verify.currentSignatureHelpDocCommentIs("This is subtract function");

238
tests/cases/fourslash/commentsOverloads.ts
View File

@@ -226,15 +226,15 @@
////foo(null);
goTo.marker('1');
verify.quickInfoIs("(function) f1(a: number): number (+ 1 overload(s))", "this is signature 1");
verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
goTo.marker('2');
verify.quickInfoIs("(function) f1(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f1(b: string): number (+1 overload)", "");
goTo.marker('3');
verify.quickInfoIs("(function) f1(a: number): number (+ 1 overload(s))", "this is signature 1");
verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
goTo.marker('4q');
verify.quickInfoIs("(function) f1(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f1(b: string): number (+1 overload)", "");
goTo.marker('o4q');
verify.quickInfoIs("(function) f1(a: number): number (+ 1 overload(s))", "this is signature 1");
verify.quickInfoIs("(function) f1(a: number): number (+1 overload)", "this is signature 1");
goTo.marker('4');
verify.currentSignatureHelpDocCommentIs("");
@@ -244,15 +244,15 @@ verify.currentSignatureHelpDocCommentIs("this is signature 1");
verify.currentParameterHelpArgumentDocCommentIs("param a");
goTo.marker('5');
verify.quickInfoIs("(function) f2(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
goTo.marker('6');
verify.quickInfoIs("(function) f2(b: string): number (+ 1 overload(s))", "this is signature 2");
verify.quickInfoIs("(function) f2(b: string): number (+1 overload)", "this is signature 2");
goTo.marker('7');
verify.quickInfoIs("(function) f2(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
goTo.marker('8q');
verify.quickInfoIs("(function) f2(b: string): number (+ 1 overload(s))", "this is signature 2");
verify.quickInfoIs("(function) f2(b: string): number (+1 overload)", "this is signature 2");
goTo.marker('o8q');
verify.quickInfoIs("(function) f2(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f2(a: number): number (+1 overload)", "");
goTo.marker('8');
verify.currentSignatureHelpDocCommentIs("this is signature 2");
@@ -263,15 +263,15 @@ verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("param a");
goTo.marker('9');
verify.quickInfoIs("(function) f3(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
goTo.marker('10');
verify.quickInfoIs("(function) f3(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f3(b: string): number (+1 overload)", "");
goTo.marker('11');
verify.quickInfoIs("(function) f3(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
goTo.marker('12q');
verify.quickInfoIs("(function) f3(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f3(b: string): number (+1 overload)", "");
goTo.marker('o12q');
verify.quickInfoIs("(function) f3(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(function) f3(a: number): number (+1 overload)", "");
goTo.marker('12');
verify.currentSignatureHelpDocCommentIs("");
@@ -282,15 +282,15 @@ verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('13');
verify.quickInfoIs("(function) f4(a: number): number (+ 1 overload(s))", "this is signature 4 - with number parameter");
verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
goTo.marker('14');
verify.quickInfoIs("(function) f4(b: string): number (+ 1 overload(s))", "this is signature 4 - with string parameter");
verify.quickInfoIs("(function) f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
goTo.marker('15');
verify.quickInfoIs("(function) f4(a: number): number (+ 1 overload(s))", "this is signature 4 - with number parameter");
verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
goTo.marker('16q');
verify.quickInfoIs("(function) f4(b: string): number (+ 1 overload(s))", "this is signature 4 - with string parameter");
verify.quickInfoIs("(function) f4(b: string): number (+1 overload)", "this is signature 4 - with string parameter");
goTo.marker('o16q');
verify.quickInfoIs("(function) f4(a: number): number (+ 1 overload(s))", "this is signature 4 - with number parameter");
verify.quickInfoIs("(function) f4(a: number): number (+1 overload)", "this is signature 4 - with number parameter");
goTo.marker('16');
verify.currentSignatureHelpDocCommentIs("this is signature 4 - with string parameter");
@@ -301,297 +301,297 @@ verify.currentSignatureHelpDocCommentIs("this is signature 4 - with number param
verify.currentParameterHelpArgumentDocCommentIs("param a");
goTo.marker('17');
verify.completionListContains('f1', '(function) f1(a: number): number (+ 1 overload(s))', 'this is signature 1');
verify.completionListContains('f2', '(function) f2(a: number): number (+ 1 overload(s))', '');
verify.completionListContains('f3', '(function) f3(a: number): number (+ 1 overload(s))', '');
verify.completionListContains('f4', '(function) f4(a: number): number (+ 1 overload(s))', 'this is signature 4 - with number parameter');
verify.completionListContains('f1', '(function) f1(a: number): number (+1 overload)', 'this is signature 1');
verify.completionListContains('f2', '(function) f2(a: number): number (+1 overload)', '');
verify.completionListContains('f3', '(function) f3(a: number): number (+1 overload)', '');
verify.completionListContains('f4', '(function) f4(a: number): number (+1 overload)', 'this is signature 4 - with number parameter');
goTo.marker('18');
verify.completionListContains('i1', 'interface i1', '');
verify.completionListContains('i1_i', '(var) i1_i: new i1(b: number) => any (+ 1 overload(s))', '');
verify.completionListContains('i1_i', '(var) i1_i: new i1(b: number) => any (+1 overload)', '');
verify.completionListContains('i2', 'interface i2', '');
verify.completionListContains('i2_i', '(var) i2_i: new i2(a: string) => any (+ 1 overload(s))', '');
verify.completionListContains('i2_i', '(var) i2_i: new i2(a: string) => any (+1 overload)', '');
verify.completionListContains('i3', 'interface i3', '');
verify.completionListContains('i3_i', '(var) i3_i: new i3(a: string) => any (+ 1 overload(s))', 'new 1');
verify.completionListContains('i3_i', '(var) i3_i: new i3(a: string) => any (+1 overload)', 'new 1');
verify.completionListContains('i4', 'interface i4', '');
verify.completionListContains('i4_i', '(var) i4_i: new i4(a: string) => any (+ 1 overload(s))', '');
verify.completionListContains('i4_i', '(var) i4_i: new i4(a: string) => any (+1 overload)', '');
goTo.marker('19');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('19q');
verify.quickInfoIs("(var) i1_i: new i1(b: number) => any (+ 1 overload(s))", "");
verify.quickInfoIs("(var) i1_i: new i1(b: number) => any (+1 overload)", "");
goTo.marker('20');
verify.currentSignatureHelpDocCommentIs("new 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('20q');
verify.quickInfoIs("(var) i1_i: new i1(a: string) => any (+ 1 overload(s))", "new 1");
verify.quickInfoIs("(var) i1_i: new i1(a: string) => any (+1 overload)", "new 1");
goTo.marker('21');
verify.currentSignatureHelpDocCommentIs("this signature 1");
verify.currentParameterHelpArgumentDocCommentIs("param a");
goTo.marker('21q');
verify.quickInfoIs("(var) i1_i: i1(a: number) => number (+ 1 overload(s))", "this signature 1");
verify.quickInfoIs("(var) i1_i: i1(a: number) => number (+1 overload)", "this signature 1");
goTo.marker('22');
verify.currentSignatureHelpDocCommentIs("this is signature 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('22q');
verify.quickInfoIs("(var) i1_i: i1(b: string) => number (+ 1 overload(s))", "this is signature 2");
verify.quickInfoIs("(var) i1_i: i1(b: string) => number (+1 overload)", "this is signature 2");
goTo.marker('23');
verify.memberListContains('foo', '(method) i1.foo(a: number): number (+ 1 overload(s))', 'foo 1');
verify.memberListContains('foo2', '(method) i1.foo2(a: number): number (+ 1 overload(s))', '');
verify.memberListContains('foo3', '(method) i1.foo3(a: number): number (+ 1 overload(s))', '');
verify.memberListContains('foo4', '(method) i1.foo4(a: number): number (+ 1 overload(s))', 'foo4 1');
verify.memberListContains('foo', '(method) i1.foo(a: number): number (+1 overload)', 'foo 1');
verify.memberListContains('foo2', '(method) i1.foo2(a: number): number (+1 overload)', '');
verify.memberListContains('foo3', '(method) i1.foo3(a: number): number (+1 overload)', '');
verify.memberListContains('foo4', '(method) i1.foo4(a: number): number (+1 overload)', 'foo4 1');
goTo.marker('24');
verify.currentSignatureHelpDocCommentIs("foo 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('24q');
verify.quickInfoIs("(method) i1.foo(a: number): number (+ 1 overload(s))", "foo 1");
verify.quickInfoIs("(method) i1.foo(a: number): number (+1 overload)", "foo 1");
goTo.marker('25');
verify.currentSignatureHelpDocCommentIs("foo 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('25q');
verify.quickInfoIs("(method) i1.foo(b: string): number (+ 1 overload(s))", "foo 2");
verify.quickInfoIs("(method) i1.foo(b: string): number (+1 overload)", "foo 2");
goTo.marker('26');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('26q');
verify.quickInfoIs("(method) i1.foo2(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) i1.foo2(a: number): number (+1 overload)", "");
goTo.marker('27');
verify.currentSignatureHelpDocCommentIs("foo2 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('27q');
verify.quickInfoIs("(method) i1.foo2(b: string): number (+ 1 overload(s))", "foo2 2");
verify.quickInfoIs("(method) i1.foo2(b: string): number (+1 overload)", "foo2 2");
goTo.marker('28');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('28q');
verify.quickInfoIs("(method) i1.foo3(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) i1.foo3(a: number): number (+1 overload)", "");
goTo.marker('29');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('29q');
verify.quickInfoIs("(method) i1.foo3(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) i1.foo3(b: string): number (+1 overload)", "");
goTo.marker('30');
verify.currentSignatureHelpDocCommentIs("foo4 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('30q');
verify.quickInfoIs("(method) i1.foo4(a: number): number (+ 1 overload(s))", "foo4 1");
verify.quickInfoIs("(method) i1.foo4(a: number): number (+1 overload)", "foo4 1");
goTo.marker('31');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('31q');
verify.quickInfoIs("(method) i1.foo4(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) i1.foo4(b: string): number (+1 overload)", "");
goTo.marker('32');
verify.currentSignatureHelpDocCommentIs("new 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('32q');
verify.quickInfoIs("(var) i2_i: new i2(b: number) => any (+ 1 overload(s))", "new 2");
verify.quickInfoIs("(var) i2_i: new i2(b: number) => any (+1 overload)", "new 2");
goTo.marker('33');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('33q');
verify.quickInfoIs("(var) i2_i: new i2(a: string) => any (+ 1 overload(s))", "");
verify.quickInfoIs("(var) i2_i: new i2(a: string) => any (+1 overload)", "");
goTo.marker('34');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('34q');
verify.quickInfoIs("(var) i2_i: i2(a: number) => number (+ 1 overload(s))", "");
verify.quickInfoIs("(var) i2_i: i2(a: number) => number (+1 overload)", "");
goTo.marker('35');
verify.currentSignatureHelpDocCommentIs("this is signature 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('35q');
verify.quickInfoIs("(var) i2_i: i2(b: string) => number (+ 1 overload(s))", "this is signature 2");
verify.quickInfoIs("(var) i2_i: i2(b: string) => number (+1 overload)", "this is signature 2");
goTo.marker('36');
verify.currentSignatureHelpDocCommentIs("new 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('36q');
verify.quickInfoIs("(var) i3_i: new i3(b: number) => any (+ 1 overload(s))", "new 2");
verify.quickInfoIs("(var) i3_i: new i3(b: number) => any (+1 overload)", "new 2");
goTo.marker('37');
verify.currentSignatureHelpDocCommentIs("new 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('37q');
verify.quickInfoIs("(var) i3_i: new i3(a: string) => any (+ 1 overload(s))", "new 1");
verify.quickInfoIs("(var) i3_i: new i3(a: string) => any (+1 overload)", "new 1");
goTo.marker('38');
verify.currentSignatureHelpDocCommentIs("this is signature 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('38q');
verify.quickInfoIs("(var) i3_i: i3(a: number) => number (+ 1 overload(s))", "this is signature 1");
verify.quickInfoIs("(var) i3_i: i3(a: number) => number (+1 overload)", "this is signature 1");
goTo.marker('39');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('39q');
verify.quickInfoIs("(var) i3_i: i3(b: string) => number (+ 1 overload(s))", "");
verify.quickInfoIs("(var) i3_i: i3(b: string) => number (+1 overload)", "");
goTo.marker('40');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('40q');
verify.quickInfoIs("(var) i4_i: new i4(b: number) => any (+ 1 overload(s))", "");
verify.quickInfoIs("(var) i4_i: new i4(b: number) => any (+1 overload)", "");
goTo.marker('41');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('41q');
verify.quickInfoIs("(var) i4_i: new i4(a: string) => any (+ 1 overload(s))", "");
verify.quickInfoIs("(var) i4_i: new i4(a: string) => any (+1 overload)", "");
goTo.marker('42');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('42q');
verify.quickInfoIs("(var) i4_i: i4(a: number) => number (+ 1 overload(s))", "");
verify.quickInfoIs("(var) i4_i: i4(a: number) => number (+1 overload)", "");
goTo.marker('43');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('43q');
verify.quickInfoIs("(var) i4_i: i4(b: string) => number (+ 1 overload(s))", "");
verify.quickInfoIs("(var) i4_i: i4(b: string) => number (+1 overload)", "");
goTo.marker('44');
verify.memberListContains('prop1', '(method) c.prop1(a: number): number (+ 1 overload(s))', '');
verify.memberListContains('prop2', '(method) c.prop2(a: number): number (+ 1 overload(s))', 'prop2 1');
verify.memberListContains('prop3', '(method) c.prop3(a: number): number (+ 1 overload(s))', '');
verify.memberListContains('prop4', '(method) c.prop4(a: number): number (+ 1 overload(s))', 'prop4 1');
verify.memberListContains('prop5', '(method) c.prop5(a: number): number (+ 1 overload(s))', 'prop5 1');
verify.memberListContains('prop1', '(method) c.prop1(a: number): number (+1 overload)', '');
verify.memberListContains('prop2', '(method) c.prop2(a: number): number (+1 overload)', 'prop2 1');
verify.memberListContains('prop3', '(method) c.prop3(a: number): number (+1 overload)', '');
verify.memberListContains('prop4', '(method) c.prop4(a: number): number (+1 overload)', 'prop4 1');
verify.memberListContains('prop5', '(method) c.prop5(a: number): number (+1 overload)', 'prop5 1');
goTo.marker('45');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('45q');
verify.quickInfoIs("(method) c.prop1(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop1(a: number): number (+1 overload)", "");
goTo.marker('46');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('46q');
verify.quickInfoIs("(method) c.prop1(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop1(b: string): number (+1 overload)", "");
goTo.marker('47');
verify.currentSignatureHelpDocCommentIs("prop2 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('47q');
verify.quickInfoIs("(method) c.prop2(a: number): number (+ 1 overload(s))", "prop2 1");
verify.quickInfoIs("(method) c.prop2(a: number): number (+1 overload)", "prop2 1");
goTo.marker('48');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('48q');
verify.quickInfoIs("(method) c.prop2(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop2(b: string): number (+1 overload)", "");
goTo.marker('49');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('49q');
verify.quickInfoIs("(method) c.prop3(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop3(a: number): number (+1 overload)", "");
goTo.marker('50');
verify.currentSignatureHelpDocCommentIs("prop3 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('50q');
verify.quickInfoIs("(method) c.prop3(b: string): number (+ 1 overload(s))", "prop3 2");
verify.quickInfoIs("(method) c.prop3(b: string): number (+1 overload)", "prop3 2");
goTo.marker('51');
verify.currentSignatureHelpDocCommentIs("prop4 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('51q');
verify.quickInfoIs("(method) c.prop4(a: number): number (+ 1 overload(s))", "prop4 1");
verify.quickInfoIs("(method) c.prop4(a: number): number (+1 overload)", "prop4 1");
goTo.marker('52');
verify.currentSignatureHelpDocCommentIs("prop4 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('52q');
verify.quickInfoIs("(method) c.prop4(b: string): number (+ 1 overload(s))", "prop4 2");
verify.quickInfoIs("(method) c.prop4(b: string): number (+1 overload)", "prop4 2");
goTo.marker('53');
verify.currentSignatureHelpDocCommentIs("prop5 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('53q');
verify.quickInfoIs("(method) c.prop5(a: number): number (+ 1 overload(s))", "prop5 1");
verify.quickInfoIs("(method) c.prop5(a: number): number (+1 overload)", "prop5 1");
goTo.marker('54');
verify.currentSignatureHelpDocCommentIs("prop5 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('54q');
verify.quickInfoIs("(method) c.prop5(b: string): number (+ 1 overload(s))", "prop5 2");
verify.quickInfoIs("(method) c.prop5(b: string): number (+1 overload)", "prop5 2");
goTo.marker('55');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('55q');
verify.quickInfoIs("(constructor) c1(a: number): c1 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
goTo.marker('56');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('56q');
verify.quickInfoIs("(constructor) c1(b: string): c1 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c1(b: string): c1 (+1 overload)", "");
goTo.marker('57');
verify.currentSignatureHelpDocCommentIs("c2 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('57q');
verify.quickInfoIs("(constructor) c2(a: number): c2 (+ 1 overload(s))", "c2 1");
verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
goTo.marker('58');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('58q');
verify.quickInfoIs("(constructor) c2(b: string): c2 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c2(b: string): c2 (+1 overload)", "");
goTo.marker('59');
verify.currentSignatureHelpDocCommentIs("");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('59q');
verify.quickInfoIs("(constructor) c3(a: number): c3 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
goTo.marker('60');
verify.currentSignatureHelpDocCommentIs("c3 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('60q');
verify.quickInfoIs("(constructor) c3(b: string): c3 (+ 1 overload(s))", "c3 2");
verify.quickInfoIs("(constructor) c3(b: string): c3 (+1 overload)", "c3 2");
goTo.marker('61');
verify.currentSignatureHelpDocCommentIs("c4 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('61q');
verify.quickInfoIs("(constructor) c4(a: number): c4 (+ 1 overload(s))", "c4 1");
verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
goTo.marker('62');
verify.currentSignatureHelpDocCommentIs("c4 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('62q');
verify.quickInfoIs("(constructor) c4(b: string): c4 (+ 1 overload(s))", "c4 2");
verify.quickInfoIs("(constructor) c4(b: string): c4 (+1 overload)", "c4 2");
goTo.marker('63');
verify.currentSignatureHelpDocCommentIs("c5 1");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('63q');
verify.quickInfoIs("(constructor) c5(a: number): c5 (+ 1 overload(s))", "c5 1");
verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
goTo.marker('64');
verify.currentSignatureHelpDocCommentIs("c5 2");
verify.currentParameterHelpArgumentDocCommentIs("");
goTo.marker('64q');
verify.quickInfoIs("(constructor) c5(b: string): c5 (+ 1 overload(s))", "c5 2");
verify.quickInfoIs("(constructor) c5(b: string): c5 (+1 overload)", "c5 2");
goTo.marker('65');
//verify.completionListContains("c", "class c", "");
@@ -615,8 +615,8 @@ verify.completionListContains("c2_i_2", "(var) c2_i_2: c2", "");
verify.completionListContains("c3_i_2", "(var) c3_i_2: c3", "");
verify.completionListContains("c4_i_2", "(var) c4_i_2: c4", "");
verify.completionListContains("c5_i_2", "(var) c5_i_2: c5", "");
verify.completionListContains('multiOverload', '(function) multiOverload(a: number): string (+ 2 overload(s))', 'This is multiOverload F1 1');
verify.completionListContains('ambientF1', '(function) ambientF1(a: number): string (+ 2 overload(s))', 'This is ambient F1 1');
verify.completionListContains('multiOverload', '(function) multiOverload(a: number): string (+2 overloads)', 'This is multiOverload F1 1');
verify.completionListContains('ambientF1', '(function) ambientF1(a: number): string (+2 overloads)', 'This is ambient F1 1');
goTo.marker('66');
verify.quickInfoIs("(var) c1_i_1: c1", "");
@@ -630,108 +630,108 @@ goTo.marker('70');
verify.quickInfoIs("(var) c5_i_1: c5", "");
goTo.marker('71');
verify.quickInfoIs("(function) multiOverload(a: number): string (+ 2 overload(s))", "This is multiOverload F1 1");
verify.quickInfoIs("(function) multiOverload(a: number): string (+2 overloads)", "This is multiOverload F1 1");
goTo.marker('72');
verify.quickInfoIs("(function) multiOverload(b: string): string (+ 2 overload(s))", "This is multiOverload F1 2");
verify.quickInfoIs("(function) multiOverload(b: string): string (+2 overloads)", "This is multiOverload F1 2");
goTo.marker('73');
verify.quickInfoIs("(function) multiOverload(c: boolean): string (+ 2 overload(s))", "This is multiOverload F1 3");
verify.quickInfoIs("(function) multiOverload(c: boolean): string (+2 overloads)", "This is multiOverload F1 3");
goTo.marker('74');
verify.quickInfoIs("(function) ambientF1(a: number): string (+ 2 overload(s))", "This is ambient F1 1");
verify.quickInfoIs("(function) ambientF1(a: number): string (+2 overloads)", "This is ambient F1 1");
goTo.marker('75');
verify.quickInfoIs("(function) ambientF1(b: string): string (+ 2 overload(s))", "This is ambient F1 2");
verify.quickInfoIs("(function) ambientF1(b: string): string (+2 overloads)", "This is ambient F1 2");
goTo.marker('76');
verify.quickInfoIs("(function) ambientF1(c: boolean): boolean (+ 2 overload(s))", "This is ambient F1 3");
verify.quickInfoIs("(function) ambientF1(c: boolean): boolean (+2 overloads)", "This is ambient F1 3");
goTo.marker('77');
verify.quickInfoIs("(parameter) aa: i3", "");
goTo.marker('78');
verify.quickInfoIs("(constructor) c1(a: number): c1 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
goTo.marker('79');
verify.quickInfoIs("(constructor) c1(b: string): c1 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c1(b: string): c1 (+1 overload)", "");
goTo.marker('80');
verify.quickInfoIs("(constructor) c1(a: number): c1 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c1(a: number): c1 (+1 overload)", "");
goTo.marker('81');
verify.quickInfoIs("(constructor) c2(a: number): c2 (+ 1 overload(s))", "c2 1");
verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
goTo.marker('82');
verify.quickInfoIs("(constructor) c2(b: string): c2 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c2(b: string): c2 (+1 overload)", "");
goTo.marker('83');
verify.quickInfoIs("(constructor) c2(a: number): c2 (+ 1 overload(s))", "c2 1");
verify.quickInfoIs("(constructor) c2(a: number): c2 (+1 overload)", "c2 1");
goTo.marker('84');
verify.quickInfoIs("(constructor) c3(a: number): c3 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
goTo.marker('85');
verify.quickInfoIs("(constructor) c3(b: string): c3 (+ 1 overload(s))", "c3 2");
verify.quickInfoIs("(constructor) c3(b: string): c3 (+1 overload)", "c3 2");
goTo.marker('86');
verify.quickInfoIs("(constructor) c3(a: number): c3 (+ 1 overload(s))", "");
verify.quickInfoIs("(constructor) c3(a: number): c3 (+1 overload)", "");
goTo.marker('87');
verify.quickInfoIs("(constructor) c4(a: number): c4 (+ 1 overload(s))", "c4 1");
verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
goTo.marker('88');
verify.quickInfoIs("(constructor) c4(b: string): c4 (+ 1 overload(s))", "c4 2");
verify.quickInfoIs("(constructor) c4(b: string): c4 (+1 overload)", "c4 2");
goTo.marker('89');
verify.quickInfoIs("(constructor) c4(a: number): c4 (+ 1 overload(s))", "c4 1");
verify.quickInfoIs("(constructor) c4(a: number): c4 (+1 overload)", "c4 1");
goTo.marker('90');
verify.quickInfoIs("(constructor) c5(a: number): c5 (+ 1 overload(s))", "c5 1");
verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
goTo.marker('91');
verify.quickInfoIs("(constructor) c5(b: string): c5 (+ 1 overload(s))", "c5 2");
verify.quickInfoIs("(constructor) c5(b: string): c5 (+1 overload)", "c5 2");
goTo.marker('92');
verify.quickInfoIs("(constructor) c5(a: number): c5 (+ 1 overload(s))", "c5 1");
verify.quickInfoIs("(constructor) c5(a: number): c5 (+1 overload)", "c5 1");
goTo.marker('93');
verify.quickInfoIs("(method) c.prop1(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop1(a: number): number (+1 overload)", "");
goTo.marker('94');
verify.quickInfoIs("(method) c.prop1(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop1(b: string): number (+1 overload)", "");
goTo.marker('95');
verify.quickInfoIs("(method) c.prop1(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop1(a: number): number (+1 overload)", "");
goTo.marker('96');
verify.quickInfoIs("(method) c.prop2(a: number): number (+ 1 overload(s))", "prop2 1");
verify.quickInfoIs("(method) c.prop2(a: number): number (+1 overload)", "prop2 1");
goTo.marker('97');
verify.quickInfoIs("(method) c.prop2(b: string): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop2(b: string): number (+1 overload)", "");
goTo.marker('98');
verify.quickInfoIs("(method) c.prop2(a: number): number (+ 1 overload(s))", "prop2 1");
verify.quickInfoIs("(method) c.prop2(a: number): number (+1 overload)", "prop2 1");
goTo.marker('99');
verify.quickInfoIs("(method) c.prop3(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop3(a: number): number (+1 overload)", "");
goTo.marker('100');
verify.quickInfoIs("(method) c.prop3(b: string): number (+ 1 overload(s))", "prop3 2");
verify.quickInfoIs("(method) c.prop3(b: string): number (+1 overload)", "prop3 2");
goTo.marker('101');
verify.quickInfoIs("(method) c.prop3(a: number): number (+ 1 overload(s))", "");
verify.quickInfoIs("(method) c.prop3(a: number): number (+1 overload)", "");
goTo.marker('102');
verify.quickInfoIs("(method) c.prop4(a: number): number (+ 1 overload(s))", "prop4 1");
verify.quickInfoIs("(method) c.prop4(a: number): number (+1 overload)", "prop4 1");
goTo.marker('103');
verify.quickInfoIs("(method) c.prop4(b: string): number (+ 1 overload(s))", "prop4 2");
verify.quickInfoIs("(method) c.prop4(b: string): number (+1 overload)", "prop4 2");
goTo.marker('104');
verify.quickInfoIs("(method) c.prop4(a: number): number (+ 1 overload(s))", "prop4 1");
verify.quickInfoIs("(method) c.prop4(a: number): number (+1 overload)", "prop4 1");
goTo.marker('105');
verify.quickInfoIs("(method) c.prop5(a: number): number (+ 1 overload(s))", "prop5 1");
verify.quickInfoIs("(method) c.prop5(a: number): number (+1 overload)", "prop5 1");
goTo.marker('106');
verify.quickInfoIs("(method) c.prop5(b: string): number (+ 1 overload(s))", "prop5 2");
verify.quickInfoIs("(method) c.prop5(b: string): number (+1 overload)", "prop5 2");
goTo.marker('107');
verify.quickInfoIs("(method) c.prop5(a: number): number (+ 1 overload(s))", "prop5 1");
verify.quickInfoIs("(method) c.prop5(a: number): number (+1 overload)", "prop5 1");

2
tests/cases/fourslash/commentsVariables.ts
View File

@@ -97,4 +97,4 @@ goTo.marker('14');
verify.quickInfoIs("(function) foo(): void", "foos comment");
goTo.marker('15');
verify.quickInfoIs("(function) foo2(a: number): void (+ 1 overload(s))", "");
verify.quickInfoIs("(function) foo2(a: number): void (+1 overload)", "");

2
tests/cases/fourslash/genericCombinators3.ts
View File

@@ -21,7 +21,7 @@ goTo.marker('1b');
verify.quickInfoIs('(parameter) y: string');
goTo.marker('1c');
verify.quickInfoIs('(method) Combinators.map<number, string, string>(c: Collection<number, string>, f: (x: number, y: string) => string): Collection<number, string> (+ 1 overload(s))');
verify.quickInfoIs('(method) Combinators.map<number, string, string>(c: Collection<number, string>, f: (x: number, y: string) => string): Collection<number, string> (+1 overload)');
goTo.marker('9');
verify.quickInfoIs('(var) r1a: Collection<number, string>');

2
tests/cases/fourslash/overloadQuickInfo.ts
View File

@@ -18,6 +18,6 @@
////Fo/**/o();
goTo.marker();
verify.quickInfoIs("(function) Foo(): any (+ 12 overload(s))");
verify.quickInfoIs("(function) Foo(): any (+12 overloads)");