Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(55945): Inlay hints don't work for bigint literals (#55947)

Browse Source
This commit is contained in:
Oleksandr T
2023-10-04 10:52:01 -07:00
committed by GitHub
parent 3752164694
commit 6ec5547823
8 changed files with 133 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/inlayHints.ts
+19 -8
View File
@@ -3,6 +3,7 @@ import {
ArrayTypeNode,
ArrowFunction,
CallExpression,
CharacterCodes,
ConditionalTypeNode,
ConstructorTypeNode,
createPrinterWithRemoveComments,
@@ -12,6 +13,7 @@ import {
EmitHint,
EnumMember,
equateStringsCaseInsensitive,
escapeString,
Expression,
findChildOfKind,
findIndex,
@@ -26,6 +28,7 @@ import {
getLanguageVariant,
getLeadingCommentRanges,
getNameOfDeclaration,
getQuotePreference,
hasContextSensitiveParameters,
Identifier,
idText,
@@ -59,9 +62,11 @@ import {
isPropertyAccessExpression,
isPropertyDeclaration,
isSpreadElement,
isStringLiteral,
isTypeNode,
isVarConst,
isVariableDeclaration,
LiteralExpression,
LiteralTypeNode,
MappedTypeNode,
MethodDeclaration,
@@ -70,7 +75,6 @@ import {
Node,
NodeArray,
NodeBuilderFlags,
NumericLiteral,
OptionalTypeNode,
ParameterDeclaration,
ParenthesizedTypeNode,
@@ -78,11 +82,11 @@ import {
PropertyDeclaration,
PropertySignature,
QualifiedName,
QuotePreference,
RestTypeNode,
Signature,
skipParentheses,
some,
StringLiteral,
Symbol,
SymbolFlags,
SyntaxKind,
@@ -125,6 +129,7 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
const { file, program, span, cancellationToken, preferences } = context;
const sourceFileText = file.text;
const compilerOptions = program.getCompilerOptions();
const quotePreference = getQuotePreference(file, preferences);
const checker = program.getTypeChecker();
const result: InlayHint[] = [];
@@ -473,6 +478,11 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
return;
}
if (isLiteralExpression(node)) {
parts.push({ text: getLiteralText(node) });
return;
}
switch (node.kind) {
case SyntaxKind.Identifier:
const identifier = node as Identifier;
@@ -485,12 +495,6 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
parts.push({ text: identifierText });
}
break;
case SyntaxKind.NumericLiteral:
parts.push({ text: (node as NumericLiteral).text });
break;
case SyntaxKind.StringLiteral:
parts.push({ text: `"${(node as StringLiteral).text}"` });
break;
case SyntaxKind.QualifiedName:
const qualifiedName = node as QualifiedName;
visitForDisplayParts(qualifiedName.left);
@@ -749,6 +753,13 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
visitForDisplayParts(node);
});
}
function getLiteralText(node: LiteralExpression) {
if (isStringLiteral(node)) {
return quotePreference === QuotePreference.Single ? `'${escapeString(node.text, CharacterCodes.singleQuote)}'` : `"${escapeString(node.text, CharacterCodes.doubleQuote)}"`;
}
return node.text;
}
}
function isUndefined(name: __String) {
tests/baselines/reference/inlayHintsInteractiveFunctionParameterTypes5.baseline
+16
View File
@@ -0,0 +1,16 @@
export function fn(b = foo) {}
^
{
"text": "",
"displayParts": [
{
"text": ": "
},
{
"text": "1n"
}
],
"position": 40,
"kind": "Type",
"whitespaceBefore": true
}
tests/baselines/reference/inlayHintsInteractiveMultifile1.baseline
+1 -1
View File
@@ -60,7 +60,7 @@ function bar () { return import('./a') }
"text": "import("
},
{
"text": "\"/a\""
"text": "'/a'"
},
{
"text": ")"
tests/baselines/reference/inlayHintsQuotePreference1.baseline
+33
View File
@@ -0,0 +1,33 @@
export function fn(a = a1, b = b1) {}
^
{
"text": "",
"displayParts": [
{
"text": ": "
},
{
"text": "\"\\\"\""
}
],
"position": 64,
"kind": "Type",
"whitespaceBefore": true
}
export function fn(a = a1, b = b1) {}
^
{
"text": "",
"displayParts": [
{
"text": ": "
},
{
"text": "\"\\\\\""
}
],
"position": 72,
"kind": "Type",
"whitespaceBefore": true
}
tests/baselines/reference/inlayHintsQuotePreference2.baseline
+33
View File
@@ -0,0 +1,33 @@
export function fn(a = a1, b = b1) {}
^
{
"text": "",
"displayParts": [
{
"text": ": "
},
{
"text": "'\\''"
}
],
"position": 64,
"kind": "Type",
"whitespaceBefore": true
}
export function fn(a = a1, b = b1) {}
^
{
"text": "",
"displayParts": [
{
"text": ": "
},
{
"text": "'\\\\'"
}
],
"position": 72,
"kind": "Type",
"whitespaceBefore": true
}
tests/cases/fourslash/inlayHintsInteractiveFunctionParameterTypes5.ts
+9
View File
@@ -0,0 +1,9 @@
/// <reference path="fourslash.ts" />
////const foo: 1n = 1n;
////export function fn(b = foo) {}
verify.baselineInlayHints(undefined, {
includeInlayFunctionParameterTypeHints: true,
interactiveInlayHints: true
});
tests/cases/fourslash/inlayHintsQuotePreference1.ts
+11
View File
@@ -0,0 +1,11 @@
/// <reference path="fourslash.ts" />
////const a1: '"' = '"';
////const b1: '\\' = '\\';
////export function fn(a = a1, b = b1) {}
verify.baselineInlayHints(undefined, {
includeInlayFunctionParameterTypeHints: true,
interactiveInlayHints: true,
quotePreference: "double"
});
tests/cases/fourslash/inlayHintsQuotePreference2.ts
+11
View File
@@ -0,0 +1,11 @@
/// <reference path="fourslash.ts" />
////const a1: "'" = "'";
////const b1: "\\" = "\\";
////export function fn(a = a1, b = b1) {}
verify.baselineInlayHints(undefined, {
includeInlayFunctionParameterTypeHints: true,
interactiveInlayHints: true,
quotePreference: "single"
});