@@ -543,9 +543,9 @@ namespace ts.SignatureHelp {
543
543
const help = { items : flatMapToMutable ( items , identity ) , applicableSpan, selectedItemIndex, argumentIndex, argumentCount } ;
544
544
const selected = help . items [ selectedItemIndex ] ;
545
545
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 ;
549
549
}
550
550
}
551
551
return help ;
@@ -646,14 +646,14 @@ namespace ts.SignatureHelp {
646
646
} ) ;
647
647
const isOptional = checker . isOptionalParameter ( parameter . valueDeclaration as ParameterDeclaration ) ;
648
648
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 } ;
650
650
}
651
651
652
652
function createSignatureHelpParameterForTypeParameter ( typeParameter : TypeParameter , checker : TypeChecker , enclosingDeclaration : Node , sourceFile : SourceFile , printer : Printer ) : SignatureHelpParameter {
653
653
const displayParts = mapToDisplayParts ( writer => {
654
654
const param = checker . typeParameterToDeclaration ( typeParameter , enclosingDeclaration , signatureHelpNodeBuilderFlags ) ! ;
655
655
printer . writeNode ( EmitHint . Unspecified , param , sourceFile , writer ) ;
656
656
} ) ;
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 } ;
658
658
}
659
659
}
0 commit comments