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

Change 'variadic' to 'rest'

Browse Source
This commit is contained in:
Nathan Shively-Sanders
2021-02-01 14:50:06 -08:00
parent 1cf9a73832
commit e55212ee5b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/services/signatureHelp.ts
View File

@@ -543,9 +543,9 @@ namespace ts.SignatureHelp {
const help = { items: flatMapToMutable(items, identity), applicableSpan, selectedItemIndex, argumentIndex, argumentCount };
const selected = help.items[selectedItemIndex];
if (selected.isVariadic) {
const firstVariadic = findIndex(selected.parameters, p => !!p.isVariadic);
if (firstVariadic > -1 && help.argumentIndex > firstVariadic) {
help.argumentIndex = firstVariadic;
const firstRest = findIndex(selected.parameters, p => !!p.isRest);
if (firstRest > -1 && help.argumentIndex > firstRest) {
help.argumentIndex = firstRest;
}
}
return help;
@@ -646,7 +646,7 @@ namespace ts.SignatureHelp {
});
const isOptional = checker.isOptionalParameter(parameter.valueDeclaration as ParameterDeclaration);
const isVariadic = !!((parameter as TransientSymbol).checkFlags & CheckFlags.RestParameter);
return { name: parameter.name, documentation: parameter.getDocumentationComment(checker), displayParts, isOptional, isVariadic };
return { name: parameter.name, documentation: parameter.getDocumentationComment(checker), displayParts, isOptional, isRest };
}
function createSignatureHelpParameterForTypeParameter(typeParameter: TypeParameter, checker: TypeChecker, enclosingDeclaration: Node, sourceFile: SourceFile, printer: Printer): SignatureHelpParameter {
@@ -654,6 +654,6 @@ namespace ts.SignatureHelp {
const param = checker.typeParameterToDeclaration(typeParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)!;
printer.writeNode(EmitHint.Unspecified, param, sourceFile, writer);
});
return { name: typeParameter.symbol.name, documentation: typeParameter.symbol.getDocumentationComment(checker), displayParts, isOptional: false, isVariadic: false };
return { name: typeParameter.symbol.name, documentation: typeParameter.symbol.getDocumentationComment(checker), displayParts, isOptional: false, isRest: false };
}
}

2
src/services/types.ts
View File

@@ -1078,7 +1078,7 @@ namespace ts {
documentation: SymbolDisplayPart[];
displayParts: SymbolDisplayPart[];
isOptional: boolean;
isVariadic?: boolean;
isRest?: boolean;
}
export interface SelectionRange {