Skip to content

Commit c0138d1

Browse files
committed
Enable signature help docComment testing
1 parent df42336 commit c0138d1

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

src/harness/fourslash.ts

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ module FourSlash {
189189
}
190190

191191
export var currentTestState: TestState = null;
192+
function assertionMessage(msg: string) {
193+
return "\nMarker: " + currentTestState.lastKnownMarker + "\nChecking: " + msg + "\n\n";
194+
}
192195

193196
export class TestCancellationToken implements ts.CancellationToken {
194197
// 0 - cancelled
@@ -652,14 +655,14 @@ module FourSlash {
652655

653656
var details = this.getCompletionEntryDetails(entryName);
654657

655-
assert.equal(ts.displayPartsToString(details.displayParts), expectedText);
658+
assert.equal(ts.displayPartsToString(details.displayParts), expectedText, assertionMessage("completion entry details text"));
656659

657660
if (expectedDocumentation != undefined) {
658-
assert.equal(ts.displayPartsToString(details.documentation), expectedDocumentation);
661+
assert.equal(ts.displayPartsToString(details.documentation), expectedDocumentation, assertionMessage("completion entry documentation"));
659662
}
660663

661664
if (kind !== undefined) {
662-
assert.equal(details.kind, kind);
665+
assert.equal(details.kind, kind, assertionMessage("completion entry kind"));
663666
}
664667
}
665668

@@ -766,10 +769,6 @@ module FourSlash {
766769
var actualQuickInfoText = actualQuickInfo ? ts.displayPartsToString(actualQuickInfo.displayParts) : "";
767770
var actualQuickInfoDocumentation = actualQuickInfo ? ts.displayPartsToString(actualQuickInfo.documentation) : "";
768771

769-
function assertionMessage(msg: string) {
770-
return "\nMarker: " + currentTestState.lastKnownMarker + "\nChecking: " + msg + "\n\n";
771-
}
772-
773772
if (negative) {
774773
if (expectedText !== undefined) {
775774
assert.notEqual(actualQuickInfoText, expectedText, assertionMessage("quick info text"));
@@ -842,7 +841,7 @@ module FourSlash {
842841

843842
var activeParameter = this.getActiveParameter();
844843
var activeParameterDocComment = activeParameter.documentation;
845-
assert.equal(activeParameterDocComment, docComment);
844+
assert.equal(ts.displayPartsToString(activeParameterDocComment), docComment, assertionMessage("current parameter Help DocComment"));
846845
}
847846

848847
public verifyCurrentSignatureHelpParameterCount(expectedCount: number) {
@@ -861,7 +860,7 @@ module FourSlash {
861860
this.taoInvalidReason = 'verifyCurrentSignatureHelpDocComment NYI';
862861

863862
var actualDocComment = this.getActiveSignatureHelpItem().documentation;
864-
assert.equal(actualDocComment, docComment);
863+
assert.equal(ts.displayPartsToString(actualDocComment), docComment, assertionMessage("current signature help doc comment"));
865864
}
866865

867866
public verifySignatureHelpCount(expected: number) {
@@ -1970,10 +1969,6 @@ module FourSlash {
19701969
this.taoInvalidReason = 'assertItemInCompletionList only supports the "name" parameter';
19711970
}
19721971

1973-
function assertionMessage(msg: string) {
1974-
return "\nMarker: " + currentTestState.lastKnownMarker + "\nChecking: " + msg + "\n\n";
1975-
}
1976-
19771972
for (var i = 0; i < items.length; i++) {
19781973
var item = items[i];
19791974
if (item.name == name) {

src/services/signatureHelp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ module ts.SignatureHelp {
317317
suffixDisplayParts: suffixParts,
318318
separatorDisplayParts: separatorParts,
319319
parameters: parameterHelpItems,
320-
documentation: <SymbolDisplayPart[]>null
320+
documentation: candidateSignature.getDocumentationComment()
321321
};
322322
});
323323

tests/cases/fourslash/fourslash.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,11 @@ module FourSlashInterface {
279279
}
280280

281281
public currentParameterHelpArgumentDocCommentIs(docComment: string) {
282-
// FourSlash.currentTestState.verifyCurrentParameterHelpDocComment(docComment);
282+
FourSlash.currentTestState.verifyCurrentParameterHelpDocComment(docComment);
283283
}
284284

285285
public currentSignatureHelpDocCommentIs(docComment: string) {
286-
// FourSlash.currentTestState.verifyCurrentSignatureHelpDocComment(docComment);
286+
FourSlash.currentTestState.verifyCurrentSignatureHelpDocComment(docComment);
287287
}
288288

289289
public signatureHelpCountIs(expected: number) {

0 commit comments

Comments
 (0)