Skip to content

Commit e55212e

Browse files
committed
Change 'variadic' to 'rest'
1 parent 1cf9a73 commit e55212e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/services/signatureHelp.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -543,9 +543,9 @@ namespace ts.SignatureHelp {
543543
const help = { items: flatMapToMutable(items, identity), applicableSpan, selectedItemIndex, argumentIndex, argumentCount };
544544
const selected = help.items[selectedItemIndex];
545545
if (selected.isVariadic) {
546-
const firstVariadic = findIndex(selected.parameters, p => !!p.isVariadic);
547-
if (firstVariadic > -1 && help.argumentIndex > firstVariadic) {
548-
help.argumentIndex = firstVariadic;
546+
const firstRest = findIndex(selected.parameters, p => !!p.isRest);
547+
if (firstRest > -1 && help.argumentIndex > firstRest) {
548+
help.argumentIndex = firstRest;
549549
}
550550
}
551551
return help;
@@ -646,14 +646,14 @@ namespace ts.SignatureHelp {
646646
});
647647
const isOptional = checker.isOptionalParameter(parameter.valueDeclaration as ParameterDeclaration);
648648
const isVariadic = !!((parameter as TransientSymbol).checkFlags & CheckFlags.RestParameter);
649-
return { name: parameter.name, documentation: parameter.getDocumentationComment(checker), displayParts, isOptional, isVariadic };
649+
return { name: parameter.name, documentation: parameter.getDocumentationComment(checker), displayParts, isOptional, isRest };
650650
}
651651

652652
function createSignatureHelpParameterForTypeParameter(typeParameter: TypeParameter, checker: TypeChecker, enclosingDeclaration: Node, sourceFile: SourceFile, printer: Printer): SignatureHelpParameter {
653653
const displayParts = mapToDisplayParts(writer => {
654654
const param = checker.typeParameterToDeclaration(typeParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)!;
655655
printer.writeNode(EmitHint.Unspecified, param, sourceFile, writer);
656656
});
657-
return { name: typeParameter.symbol.name, documentation: typeParameter.symbol.getDocumentationComment(checker), displayParts, isOptional: false, isVariadic: false };
657+
return { name: typeParameter.symbol.name, documentation: typeParameter.symbol.getDocumentationComment(checker), displayParts, isOptional: false, isRest: false };
658658
}
659659
}

src/services/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@ namespace ts {
10781078
documentation: SymbolDisplayPart[];
10791079
displayParts: SymbolDisplayPart[];
10801080
isOptional: boolean;
1081-
isVariadic?: boolean;
1081+
isRest?: boolean;
10821082
}
10831083

10841084
export interface SelectionRange {

0 commit comments

Comments
 (0)