microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 01:04:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Show interactive inlay hints in parameter types (#55918)

Browse Source
This commit is contained in:
Maria José Solano
2023-09-29 13:45:57 -07:00
committed by GitHub
parent 38d09d4ae1
commit 952526c5c9
4 changed files with 276 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/services/inlayHints.ts
View File

@@ -253,14 +253,14 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
return;
}
const hints = typeToInlayHintParts(declarationType);
if (hints) {
const hintText = typeof hints === "string" ? hints : hints.map(part => part.text).join("");
const hintParts = typeToInlayHintParts(declarationType);
if (hintParts) {
const hintText = typeof hintParts === "string" ? hintParts : hintParts.map(part => part.text).join("");
const isVariableNameMatchesType = preferences.includeInlayVariableTypeHintsWhenTypeMatchesName === false && equateStringsCaseInsensitive(decl.name.getText(), hintText);
if (isVariableNameMatchesType) {
return;
}
addTypeHints(hints, decl.name.end);
addTypeHints(hintParts, decl.name.end);
}
}
@@ -385,9 +385,9 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
return;
}
const hint = typeToInlayHintParts(returnType);
if (hint) {
addTypeHints(hint, getTypeAnnotationPosition(decl));
const hintParts = typeToInlayHintParts(returnType);
if (hintParts) {
addTypeHints(hintParts, getTypeAnnotationPosition(decl));
}
}
@@ -416,16 +416,16 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
continue;
}
const typeDisplayString = getParameterDeclarationTypeDisplayString(signature.parameters[i]);
if (!typeDisplayString) {
const typeHints = getParameterDeclarationTypeHints(signature.parameters[i]);
if (!typeHints) {
continue;
}
addTypeHints(typeDisplayString, param.questionToken ? param.questionToken.end : param.name.end);
addTypeHints(typeHints, param.questionToken ? param.questionToken.end : param.name.end);
}
}
function getParameterDeclarationTypeDisplayString(symbol: Symbol) {
function getParameterDeclarationTypeHints(symbol: Symbol) {
const valueDeclaration = symbol.valueDeclaration;
if (!valueDeclaration || !isParameter(valueDeclaration)) {
return undefined;
@@ -435,8 +435,7 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
if (isModuleReferenceType(signatureParamType)) {
return undefined;
}
return printTypeInSingleLine(signatureParamType);
return typeToInlayHintParts(signatureParamType);
}
function printTypeInSingleLine(type: Type) {