typescript 5.2.0-dev.20230720 → 5.2.0-dev.20230722

package/lib/tsserver.js

@@ -970,6 +970,7 @@ __export(server_exports, {
   getPropertyAssignmentAliasLikeExpression: () => getPropertyAssignmentAliasLikeExpression,
   getPropertyNameForPropertyNameNode: () => getPropertyNameForPropertyNameNode,
   getPropertyNameForUniqueESSymbol: () => getPropertyNameForUniqueESSymbol,
+  getPropertyNameFromType: () => getPropertyNameFromType,
   getPropertyNameOfBindingOrAssignmentElement: () => getPropertyNameOfBindingOrAssignmentElement,
   getPropertySymbolFromBindingElement: () => getPropertySymbolFromBindingElement,
   getPropertySymbolsFromContextualType: () => getPropertySymbolsFromContextualType,
@@ -1802,6 +1803,7 @@ __export(server_exports, {
   isTypeQueryNode: () => isTypeQueryNode,
   isTypeReferenceNode: () => isTypeReferenceNode,
   isTypeReferenceType: () => isTypeReferenceType,
+  isTypeUsableAsPropertyName: () => isTypeUsableAsPropertyName,
   isUMDExportSymbol: () => isUMDExportSymbol,
   isUnaryExpression: () => isUnaryExpression,
   isUnaryExpressionWithWrite: () => isUnaryExpressionWithWrite,
@@ -2327,7 +2329,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230720`;
+var version = `${versionMajorMinor}.0-dev.20230722`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -21601,6 +21603,18 @@ function getTextOfJsxNamespacedName(node) {
 function intrinsicTagNameToString(node) {
   return isIdentifier(node) ? idText(node) : getTextOfJsxNamespacedName(node);
 }
+function isTypeUsableAsPropertyName(type) {
+  return !!(type.flags & 8576 /* StringOrNumberLiteralOrUnique */);
+}
+function getPropertyNameFromType(type) {
+  if (type.flags & 8192 /* UniqueESSymbol */) {
+    return type.escapedName;
+  }
+  if (type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */)) {
+    return escapeLeadingUnderscores("" + type.value);
+  }
+  return Debug.fail();
+}
 
 // src/compiler/factory/baseNodeFactory.ts
 function createBaseNodeFactory() {
@@ -35109,10 +35123,14 @@ var Parser;
         case 124 /* ProtectedKeyword */:
         case 125 /* PublicKeyword */:
         case 148 /* ReadonlyKeyword */:
+          const previousToken = token();
           nextToken();
           if (scanner2.hasPrecedingLineBreak()) {
             return false;
           }
+          if (previousToken === 138 /* DeclareKeyword */ && token() === 156 /* TypeKeyword */) {
+            return true;
+          }
           continue;
         case 162 /* GlobalKeyword */:
           nextToken();
@@ -35477,14 +35495,14 @@ var Parser;
   function parseObjectBindingPattern() {
     const pos = getNodePos();
     parseExpected(19 /* OpenBraceToken */);
-    const elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
+    const elements = allowInAnd(() => parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement));
     parseExpected(20 /* CloseBraceToken */);
     return finishNode(factory2.createObjectBindingPattern(elements), pos);
   }
   function parseArrayBindingPattern() {
     const pos = getNodePos();
     parseExpected(23 /* OpenBracketToken */);
-    const elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
+    const elements = allowInAnd(() => parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement));
     parseExpected(24 /* CloseBracketToken */);
     return finishNode(factory2.createArrayBindingPattern(elements), pos);
   }
@@ -36002,6 +36020,9 @@ var Parser;
   }
   function parseTypeAliasDeclaration(pos, hasJSDoc, modifiers) {
     parseExpected(156 /* TypeKeyword */);
+    if (scanner2.hasPrecedingLineBreak()) {
+      parseErrorAtCurrentToken(Diagnostics.Line_break_not_permitted_here);
+    }
     const name = parseIdentifier();
     const typeParameters = parseTypeParameters();
     parseExpected(64 /* EqualsToken */);
@@ -37903,7 +37924,7 @@ function getNamedArgRegEx(name) {
   return result;
 }
 var tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
-var singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
+var singleLinePragmaRegEx = /^\/\/\/?\s*@([^\s:]+)(.*)\s*$/im;
 function extractPragmas(pragmas, range, text) {
   const tripleSlash = range.kind === 2 /* SingleLineCommentTrivia */ && tripleSlashXMLCommentStartRegEx.exec(text);
   if (tripleSlash) {
@@ -47818,7 +47839,7 @@ function createTypeChecker(host) {
       return node ? getTypeFromTypeNode(node) : errorType;
     },
     getParameterType: getTypeAtPosition,
-    getParameterIdentifierNameAtPosition,
+    getParameterIdentifierInfoAtPosition,
     getPromisedTypeOfPromise,
     getAwaitedType: (type) => getAwaitedType(type),
     getReturnTypeOfSignature,
@@ -56281,7 +56302,7 @@ function createTypeChecker(host) {
       false,
       definedInMethod && !definedInConstructor
     ));
-    if (symbol.valueDeclaration && filterType(widened, (t) => !!(t.flags & ~98304 /* Nullable */)) === neverType) {
+    if (symbol.valueDeclaration && isInJSFile(symbol.valueDeclaration) && filterType(widened, (t) => !!(t.flags & ~98304 /* Nullable */)) === neverType) {
       reportImplicitAny(symbol.valueDeclaration, anyType);
       return anyType;
     }
@@ -57560,9 +57581,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function isTypeUsableAsPropertyName(type) {
-    return !!(type.flags & 8576 /* StringOrNumberLiteralOrUnique */);
-  }
   function isLateBindableName(node) {
     if (!isComputedPropertyName(node) && !isElementAccessExpression(node)) {
       return false;
@@ -57583,15 +57601,6 @@ function createTypeChecker(host) {
   function isNonBindableDynamicName(node) {
     return isDynamicName(node) && !isLateBindableName(node);
   }
-  function getPropertyNameFromType(type) {
-    if (type.flags & 8192 /* UniqueESSymbol */) {
-      return type.escapedName;
-    }
-    if (type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */)) {
-      return escapeLeadingUnderscores("" + type.value);
-    }
-    return Debug.fail();
-  }
   function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
     Debug.assert(!!(getCheckFlags(symbol) & 4096 /* Late */), "Expected a late-bound symbol.");
     symbol.flags |= symbolFlags;
@@ -58238,20 +58247,17 @@ function createTypeChecker(host) {
       setStructuredTypeMembers(type, members2, callSignatures, constructSignatures, indexInfos2);
       return;
     }
-    let members = emptySymbols;
+    let members = getExportsOfSymbol(symbol);
     let indexInfos;
-    if (symbol.exports) {
-      members = getExportsOfSymbol(symbol);
-      if (symbol === globalThisSymbol) {
-        const varsOnly = /* @__PURE__ */ new Map();
-        members.forEach((p) => {
-          var _a;
-          if (!(p.flags & 418 /* BlockScoped */) && !(p.flags & 512 /* ValueModule */ && ((_a = p.declarations) == null ? void 0 : _a.length) && every(p.declarations, isAmbientModule))) {
-            varsOnly.set(p.escapedName, p);
-          }
-        });
-        members = varsOnly;
-      }
+    if (symbol === globalThisSymbol) {
+      const varsOnly = /* @__PURE__ */ new Map();
+      members.forEach((p) => {
+        var _a;
+        if (!(p.flags & 418 /* BlockScoped */) && !(p.flags & 512 /* ValueModule */ && ((_a = p.declarations) == null ? void 0 : _a.length) && every(p.declarations, isAmbientModule))) {
+          varsOnly.set(p.escapedName, p);
+        }
+      });
+      members = varsOnly;
     }
     let baseConstructorIndexInfo;
     setStructuredTypeMembers(type, members, emptyArray, emptyArray, emptyArray);
@@ -76763,7 +76769,7 @@ function createTypeChecker(host) {
     }
     return restParameter.escapedName;
   }
-  function getParameterIdentifierNameAtPosition(signature, pos) {
+  function getParameterIdentifierInfoAtPosition(signature, pos) {
     var _a;
     if (((_a = signature.declaration) == null ? void 0 : _a.kind) === 324 /* JSDocFunctionType */) {
       return void 0;
@@ -76771,10 +76777,16 @@ function createTypeChecker(host) {
     const paramCount = signature.parameters.length - (signatureHasRestParameter(signature) ? 1 : 0);
     if (pos < paramCount) {
       const param = signature.parameters[pos];
-      return isParameterDeclarationWithIdentifierName(param) ? [param.escapedName, false] : void 0;
+      const paramIdent = getParameterDeclarationIdentifier(param);
+      return paramIdent ? {
+        parameter: paramIdent,
+        parameterName: param.escapedName,
+        isRestParameter: false
+      } : void 0;
     }
     const restParameter = signature.parameters[paramCount] || unknownSymbol;
-    if (!isParameterDeclarationWithIdentifierName(restParameter)) {
+    const restIdent = getParameterDeclarationIdentifier(restParameter);
+    if (!restIdent) {
       return void 0;
     }
     const restType = getTypeOfSymbol(restParameter);
@@ -76783,18 +76795,19 @@ function createTypeChecker(host) {
       const index = pos - paramCount;
       const associatedName = associatedNames == null ? void 0 : associatedNames[index];
       const isRestTupleElement = !!(associatedName == null ? void 0 : associatedName.dotDotDotToken);
-      return associatedName ? [
-        getTupleElementLabel(associatedName),
-        isRestTupleElement
-      ] : void 0;
+      if (associatedName) {
+        Debug.assert(isIdentifier(associatedName.name));
+        return { parameter: associatedName.name, parameterName: associatedName.name.escapedText, isRestParameter: isRestTupleElement };
+      }
+      return void 0;
     }
     if (pos === paramCount) {
-      return [restParameter.escapedName, true];
+      return { parameter: restIdent, parameterName: restParameter.escapedName, isRestParameter: true };
     }
     return void 0;
   }
-  function isParameterDeclarationWithIdentifierName(symbol) {
-    return symbol.valueDeclaration && isParameter(symbol.valueDeclaration) && isIdentifier(symbol.valueDeclaration.name);
+  function getParameterDeclarationIdentifier(symbol) {
+    return symbol.valueDeclaration && isParameter(symbol.valueDeclaration) && isIdentifier(symbol.valueDeclaration.name) && symbol.valueDeclaration.name;
   }
   function isValidDeclarationForTupleLabel(d) {
     return d.kind === 202 /* NamedTupleMember */ || isParameter(d) && d.name && isIdentifier(d.name);
@@ -136034,8 +136047,8 @@ function computeSuggestionDiagnostics(sourceFile, program, cancellationToken) {
           diags.push(createDiagnosticForNode(init, Diagnostics.require_call_may_be_converted_to_an_import));
         }
       }
-      const jsdocTypedefNode = ts_codefix_exports.getJSDocTypedefNode(node);
-      if (jsdocTypedefNode) {
+      const jsdocTypedefNodes = ts_codefix_exports.getJSDocTypedefNodes(node);
+      for (const jsdocTypedefNode of jsdocTypedefNodes) {
         diags.push(createDiagnosticForNode(jsdocTypedefNode, Diagnostics.JSDoc_typedef_may_be_converted_to_TypeScript_type));
       }
       if (ts_codefix_exports.parameterShouldGetTypeFromJSDoc(node)) {
@@ -146854,7 +146867,7 @@ __export(ts_codefix_exports, {
   getFixes: () => getFixes,
   getImportCompletionAction: () => getImportCompletionAction,
   getImportKind: () => getImportKind,
-  getJSDocTypedefNode: () => getJSDocTypedefNode,
+  getJSDocTypedefNodes: () => getJSDocTypedefNodes,
   getNoopSymbolTrackerWithResolver: () => getNoopSymbolTrackerWithResolver,
   getPromoteTypeOnlyCompletionAction: () => getPromoteTypeOnlyCompletionAction,
   getSupportedErrorCodes: () => getSupportedErrorCodes,
@@ -149576,13 +149589,14 @@ registerCodeFix({
   fixIds: [fixId14],
   errorCodes: errorCodes15,
   getCodeActions(context) {
+    const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
     const node = getTokenAtPosition(
       context.sourceFile,
       context.span.start
     );
     if (!node)
       return;
-    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange12(t, node, context.sourceFile));
+    const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange12(t, node, context.sourceFile, newLineCharacter));
     if (changes.length > 0) {
       return [
         createCodeFixAction(
@@ -149595,29 +149609,72 @@ registerCodeFix({
       ];
     }
   },
-  getAllCodeActions: (context) => codeFixAll(context, errorCodes15, (changes, diag2) => {
-    const node = getTokenAtPosition(diag2.file, diag2.start);
-    if (node)
-      doChange12(changes, node, diag2.file);
-  })
+  getAllCodeActions: (context) => codeFixAll(
+    context,
+    errorCodes15,
+    (changes, diag2) => {
+      const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
+      const node = getTokenAtPosition(diag2.file, diag2.start);
+      const fixAll = true;
+      if (node)
+        doChange12(changes, node, diag2.file, newLineCharacter, fixAll);
+    }
+  )
 });
-function doChange12(changes, node, sourceFile) {
-  if (isJSDocTypedefTag(node)) {
-    fixSingleTypeDef(changes, node, sourceFile);
-  }
-}
-function fixSingleTypeDef(changes, typeDefNode, sourceFile) {
-  if (!typeDefNode)
+function doChange12(changes, node, sourceFile, newLine, fixAll = false) {
+  if (!isJSDocTypedefTag(node))
     return;
-  const declaration = createDeclaration(typeDefNode);
+  const declaration = createDeclaration(node);
   if (!declaration)
     return;
-  const comment = typeDefNode.parent;
-  changes.replaceNode(
-    sourceFile,
-    comment,
-    declaration
+  const commentNode = node.parent;
+  const { leftSibling, rightSibling } = getLeftAndRightSiblings(node);
+  let pos = commentNode.getStart();
+  let prefix = "";
+  if (!leftSibling && commentNode.comment) {
+    pos = findEndOfTextBetween(commentNode, commentNode.getStart(), node.getStart());
+    prefix = `${newLine} */${newLine}`;
+  }
+  if (leftSibling) {
+    if (fixAll && isJSDocTypedefTag(leftSibling)) {
+      pos = node.getStart();
+      prefix = "";
+    } else {
+      pos = findEndOfTextBetween(commentNode, leftSibling.getStart(), node.getStart());
+      prefix = `${newLine} */${newLine}`;
+    }
+  }
+  let end = commentNode.getEnd();
+  let suffix = "";
+  if (rightSibling) {
+    if (fixAll && isJSDocTypedefTag(rightSibling)) {
+      end = rightSibling.getStart();
+      suffix = `${newLine}${newLine}`;
+    } else {
+      end = rightSibling.getStart();
+      suffix = `${newLine}/**${newLine} * `;
+    }
+  }
+  changes.replaceRange(sourceFile, { pos, end }, declaration, { prefix, suffix });
+}
+function getLeftAndRightSiblings(typedefNode) {
+  const commentNode = typedefNode.parent;
+  const maxChildIndex = commentNode.getChildCount() - 1;
+  const currentNodeIndex = commentNode.getChildren().findIndex(
+    (n) => n.getStart() === typedefNode.getStart() && n.getEnd() === typedefNode.getEnd()
   );
+  const leftSibling = currentNodeIndex > 0 ? commentNode.getChildAt(currentNodeIndex - 1) : void 0;
+  const rightSibling = currentNodeIndex < maxChildIndex ? commentNode.getChildAt(currentNodeIndex + 1) : void 0;
+  return { leftSibling, rightSibling };
+}
+function findEndOfTextBetween(jsDocComment, from, to) {
+  const comment = jsDocComment.getText().substring(from - jsDocComment.getStart(), to - jsDocComment.getStart());
+  for (let i = comment.length; i > 0; i--) {
+    if (!/[*\/\s]/g.test(comment.substring(i - 1, i))) {
+      return from + i;
+    }
+  }
+  return to;
 }
 function createDeclaration(tag) {
   var _a;
@@ -149638,7 +149695,7 @@ function createInterfaceForTypeLiteral(typeName, typeLiteral) {
   const propertySignatures = createSignatureFromTypeLiteral(typeLiteral);
   if (!some(propertySignatures))
     return;
-  const interfaceDeclaration = factory.createInterfaceDeclaration(
+  return factory.createInterfaceDeclaration(
     /*modifiers*/
     void 0,
     typeName,
@@ -149648,13 +149705,12 @@ function createInterfaceForTypeLiteral(typeName, typeLiteral) {
     void 0,
     propertySignatures
   );
-  return interfaceDeclaration;
 }
 function createTypeAliasForTypeExpression(typeName, typeExpression) {
   const typeReference = getSynthesizedDeepClone(typeExpression.type);
   if (!typeReference)
     return;
-  const declaration = factory.createTypeAliasDeclaration(
+  return factory.createTypeAliasDeclaration(
     /*modifiers*/
     void 0,
     factory.createIdentifier(typeName),
@@ -149662,7 +149718,6 @@ function createTypeAliasForTypeExpression(typeName, typeExpression) {
     void 0,
     typeReference
   );
-  return declaration;
 }
 function createSignatureFromTypeLiteral(typeLiteral) {
   const propertyTags = typeLiteral.jsDocPropertyTags;
@@ -149682,30 +149737,28 @@ function createSignatureFromTypeLiteral(typeLiteral) {
     }
     if (typeReference && name) {
       const questionToken = isOptional ? factory.createToken(58 /* QuestionToken */) : void 0;
-      const prop = factory.createPropertySignature(
+      return factory.createPropertySignature(
         /*modifiers*/
         void 0,
         name,
         questionToken,
         typeReference
       );
-      return prop;
     }
   };
-  const props = mapDefined(propertyTags, getSignature);
-  return props;
+  return mapDefined(propertyTags, getSignature);
 }
 function getPropertyName(tag) {
   return tag.name.kind === 80 /* Identifier */ ? tag.name.text : tag.name.right.text;
 }
-function getJSDocTypedefNode(node) {
+function getJSDocTypedefNodes(node) {
   if (hasJSDocNodes(node)) {
-    return forEach(node.jsDoc, (node2) => {
+    return flatMap(node.jsDoc, (doc) => {
       var _a;
-      return (_a = node2.tags) == null ? void 0 : _a.find(isJSDocTypedefTag);
+      return (_a = doc.tags) == null ? void 0 : _a.filter((tag) => isJSDocTypedefTag(tag));
     });
   }
-  return void 0;
+  return [];
 }
 
 // src/services/codefixes/convertLiteralTypeToMappedType.ts
@@ -151955,6 +152008,8 @@ function getInfo9(checker, sourceFile, position, errorCode) {
       if (!declaration || !isCallExpression(declaration.parent) || !declaration.body)
         return void 0;
       const pos = declaration.parent.arguments.indexOf(declaration);
+      if (pos === -1)
+        return void 0;
       const type = checker.getContextualTypeForArgumentAtIndex(declaration.parent, pos);
       if (!type)
         return void 0;
@@ -155122,15 +155177,11 @@ var PreserveOptionalFlags = /* @__PURE__ */ ((PreserveOptionalFlags2) => {
 })(PreserveOptionalFlags || {});
 function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, sourceFile, context, preferences, importAdder, addClassElement, body, preserveOptional = 3 /* All */, isAmbient = false) {
   const declarations = symbol.getDeclarations();
-  const declaration = declarations == null ? void 0 : declarations[0];
+  const declaration = firstOrUndefined(declarations);
   const checker = context.program.getTypeChecker();
   const scriptTarget = getEmitScriptTarget(context.program.getCompilerOptions());
   const kind = (declaration == null ? void 0 : declaration.kind) ?? 171 /* PropertySignature */;
-  const declarationName = getSynthesizedDeepClone(
-    getNameOfDeclaration(declaration),
-    /*includeTrivia*/
-    false
-  );
+  const declarationName = createDeclarationName(symbol, declaration);
   const effectiveModifierFlags = declaration ? getEffectiveModifierFlags(declaration) : 0 /* None */;
   let modifierFlags = effectiveModifierFlags & 32 /* Static */;
   modifierFlags |= effectiveModifierFlags & 4 /* Public */ ? 4 /* Public */ : effectiveModifierFlags & 16 /* Protected */ ? 16 /* Protected */ : 0 /* None */;
@@ -155281,6 +155332,19 @@ function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, sourceFile, con
       false
     );
   }
+  function createDeclarationName(symbol2, declaration2) {
+    if (getCheckFlags(symbol2) & 262144 /* Mapped */) {
+      const nameType = symbol2.links.nameType;
+      if (nameType && isTypeUsableAsPropertyName(nameType)) {
+        return factory.createIdentifier(unescapeLeadingUnderscores(getPropertyNameFromType(nameType)));
+      }
+    }
+    return getSynthesizedDeepClone(
+      getNameOfDeclaration(declaration2),
+      /*includeTrivia*/
+      false
+    );
+  }
 }
 function createSignatureDeclarationFromSignature(kind, context, quotePreference, signature, body, name, modifiers, optional, enclosingDeclaration, importAdder) {
   const program = context.program;
@@ -164498,7 +164562,7 @@ __export(ts_InlayHints_exports, {
 });
 
 // src/services/inlayHints.ts
-var maxHintsLength = 30;
+var maxTypeHintLength = 30;
 var leadingParameterNameCommentRegexFactory = (name) => {
   return new RegExp(`^\\s?/\\*\\*?\\s?${name}\\s?\\*\\/\\s?$`);
 };
@@ -164508,6 +164572,9 @@ function shouldShowParameterNameHints(preferences) {
 function shouldShowLiteralParameterNameHintsOnly(preferences) {
   return preferences.includeInlayParameterNameHints === "literals";
 }
+function shouldUseInteractiveInlayHints(preferences) {
+  return preferences.interactiveInlayHints === true;
+}
 function provideInlayHints(context) {
   const { file, program, span, cancellationToken, preferences } = context;
   const sourceFileText = file.text;
@@ -164558,9 +164625,15 @@ function provideInlayHints(context) {
   function isSignatureSupportingReturnAnnotation(node) {
     return isArrowFunction(node) || isFunctionExpression(node) || isFunctionDeclaration(node) || isMethodDeclaration(node) || isGetAccessorDeclaration(node);
   }
-  function addParameterHints(text, position, isFirstVariadicArgument) {
+  function addParameterHints(text, parameter, position, isFirstVariadicArgument, sourceFile) {
+    let hintText = `${isFirstVariadicArgument ? "..." : ""}${text}`;
+    if (shouldUseInteractiveInlayHints(preferences)) {
+      hintText = [getNodeDisplayPart(hintText, parameter, sourceFile), { text: ":" }];
+    } else {
+      hintText += ":";
+    }
     result.push({
-      text: `${isFirstVariadicArgument ? "..." : ""}${truncation(text, maxHintsLength)}:`,
+      text: hintText,
       position,
       kind: "Parameter" /* Parameter */,
       whitespaceAfter: true
@@ -164568,7 +164641,7 @@ function provideInlayHints(context) {
   }
   function addTypeHints(text, position) {
     result.push({
-      text: `: ${truncation(text, maxHintsLength)}`,
+      text: `: ${text.length > maxTypeHintLength ? text.substr(0, maxTypeHintLength - "...".length) + "..." : text}`,
       position,
       kind: "Type" /* Type */,
       whitespaceBefore: true
@@ -164576,7 +164649,7 @@ function provideInlayHints(context) {
   }
   function addEnumMemberValueHints(text, position) {
     result.push({
-      text: `= ${truncation(text, maxHintsLength)}`,
+      text: `= ${text}`,
       position,
       kind: "Enum" /* Enum */,
       whitespaceBefore: true
@@ -164626,6 +164699,7 @@ function provideInlayHints(context) {
       return;
     }
     let signatureParamPos = 0;
+    const sourceFile = shouldUseInteractiveInlayHints(preferences) ? expr.getSourceFile() : void 0;
     for (const originalArg of args) {
       const arg = skipParentheses(originalArg);
       if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
@@ -164646,10 +164720,10 @@ function provideInlayHints(context) {
           }
         }
       }
-      const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, signatureParamPos);
+      const identifierInfo = checker.getParameterIdentifierInfoAtPosition(signature, signatureParamPos);
       signatureParamPos = signatureParamPos + (spreadArgs || 1);
-      if (identifierNameInfo) {
-        const [parameterName, isFirstVariadicArgument] = identifierNameInfo;
+      if (identifierInfo) {
+        const { parameter, parameterName, isRestParameter: isFirstVariadicArgument } = identifierInfo;
         const isParameterNameNotSameAsArgument = preferences.includeInlayParameterNameHintsWhenArgumentMatchesName || !identifierOrAccessExpressionPostfixMatchesParameterName(arg, parameterName);
         if (!isParameterNameNotSameAsArgument && !isFirstVariadicArgument) {
           continue;
@@ -164658,7 +164732,7 @@ function provideInlayHints(context) {
         if (leadingCommentsContainsParameterName(arg, name)) {
           continue;
         }
-        addParameterHints(name, originalArg.getStart(), isFirstVariadicArgument);
+        addParameterHints(name, parameter, originalArg.getStart(), isFirstVariadicArgument, sourceFile);
       }
     }
   }
@@ -164764,12 +164838,6 @@ function provideInlayHints(context) {
     }
     return printTypeInSingleLine(signatureParamType);
   }
-  function truncation(text, maxLength2) {
-    if (text.length > maxLength2) {
-      return text.substr(0, maxLength2 - "...".length) + "...";
-    }
-    return text;
-  }
   function printTypeInSingleLine(type) {
     const flags = 70221824 /* IgnoreErrors */ | 1048576 /* AllowUniqueESSymbolType */ | 16384 /* UseAliasDefinedOutsideCurrentScope */;
     const printer = createPrinterWithRemoveComments();
@@ -164800,6 +164868,13 @@ function provideInlayHints(context) {
     }
     return true;
   }
+  function getNodeDisplayPart(text, node, sourceFile) {
+    return {
+      text,
+      span: createTextSpanFromNode(node, sourceFile),
+      file: sourceFile.fileName
+    };
+  }
 }
 
 // src/services/_namespaces/ts.JsDoc.ts
@@ -167219,7 +167294,7 @@ function getSymbolModifiers(typeChecker, symbol) {
   }
   return modifiers.size > 0 ? arrayFrom(modifiers.values()).join(",") : "" /* none */;
 }
-function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, enclosingDeclaration, location, semanticMeaning = getMeaningFromLocation(location), alias) {
+function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker, symbol, sourceFile, enclosingDeclaration, location, type, semanticMeaning, alias) {
   var _a;
   const displayParts = [];
   let documentation = [];
@@ -167228,7 +167303,6 @@ function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, so
   let symbolKind = semanticMeaning & 1 /* Value */ ? getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) : "" /* unknown */;
   let hasAddedSymbolInfo = false;
   const isThisExpression = location.kind === 110 /* ThisKeyword */ && isInExpressionContext(location) || isThisInTypeQuery(location);
-  let type;
   let documentationFromAlias;
   let tagsFromAlias;
   let hasMultipleSignatures = false;
@@ -167257,7 +167331,7 @@ function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, so
       }
     }
     let signature;
-    type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
+    type ?? (type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location));
     if (location.parent && location.parent.kind === 211 /* PropertyAccessExpression */) {
       const right = location.parent.name;
       if (right === location || right && right.getFullWidth() === 0) {
@@ -167472,12 +167546,13 @@ function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, so
         if (declarationName && !hasAddedSymbolInfo) {
           const isExternalModuleDeclaration = isModuleWithStringLiteralName(resolvedNode) && hasSyntacticModifier(resolvedNode, 2 /* Ambient */);
           const shouldUseAliasName = symbol.name !== "default" && !isExternalModuleDeclaration;
-          const resolvedInfo = getSymbolDisplayPartsDocumentationAndSymbolKind(
+          const resolvedInfo = getSymbolDisplayPartsDocumentationAndSymbolKindWorker(
             typeChecker,
             resolvedSymbol,
             getSourceFileOfNode(resolvedNode),
             resolvedNode,
             declarationName,
+            type,
             semanticMeaning,
             shouldUseAliasName ? symbol : resolvedSymbol
           );
@@ -167732,6 +167807,19 @@ function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, so
     addRange(displayParts, typeParameterParts);
   }
 }
+function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, enclosingDeclaration, location, semanticMeaning = getMeaningFromLocation(location), alias) {
+  return getSymbolDisplayPartsDocumentationAndSymbolKindWorker(
+    typeChecker,
+    symbol,
+    sourceFile,
+    enclosingDeclaration,
+    location,
+    /*type*/
+    void 0,
+    semanticMeaning,
+    alias
+  );
+}
 function isLocalVariableOrFunction(symbol) {
   if (symbol.parent) {
     return false;
@@ -172741,6 +172829,7 @@ __export(ts_exports2, {
   getPropertyAssignmentAliasLikeExpression: () => getPropertyAssignmentAliasLikeExpression,
   getPropertyNameForPropertyNameNode: () => getPropertyNameForPropertyNameNode,
   getPropertyNameForUniqueESSymbol: () => getPropertyNameForUniqueESSymbol,
+  getPropertyNameFromType: () => getPropertyNameFromType,
   getPropertyNameOfBindingOrAssignmentElement: () => getPropertyNameOfBindingOrAssignmentElement,
   getPropertySymbolFromBindingElement: () => getPropertySymbolFromBindingElement,
   getPropertySymbolsFromContextualType: () => getPropertySymbolsFromContextualType,
@@ -173573,6 +173662,7 @@ __export(ts_exports2, {
   isTypeQueryNode: () => isTypeQueryNode,
   isTypeReferenceNode: () => isTypeReferenceNode,
   isTypeReferenceType: () => isTypeReferenceType,
+  isTypeUsableAsPropertyName: () => isTypeUsableAsPropertyName,
   isUMDExportSymbol: () => isUMDExportSymbol,
   isUnaryExpression: () => isUnaryExpression,
   isUnaryExpressionWithWrite: () => isUnaryExpressionWithWrite,
@@ -183431,10 +183521,22 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
     const { file, project } = this.getFileAndProject(args);
     const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
     const hints = project.getLanguageService().provideInlayHints(file, args, this.getPreferences(file));
-    return hints.map((hint) => ({
-      ...hint,
-      position: scriptInfo.positionToLineOffset(hint.position)
-    }));
+    return hints.map((hint) => {
+      const { text, position } = hint;
+      const hintText = typeof text === "string" ? text : text.map(({ text: text2, span, file: file2 }) => ({
+        text: text2,
+        span: span && {
+          start: scriptInfo.positionToLineOffset(span.start),
+          end: scriptInfo.positionToLineOffset(span.start + span.length),
+          file: file2
+        }
+      }));
+      return {
+        ...hint,
+        position: scriptInfo.positionToLineOffset(position),
+        text: hintText
+      };
+    });
   }
   setCompilerOptionsForInferredProjects(args) {
     this.projectService.setCompilerOptionsForInferredProjects(args.options, args.projectRootPath);
@@ -187255,6 +187357,7 @@ start(initializeNodeSystem(), require("os").platform());
   getPropertyAssignmentAliasLikeExpression,
   getPropertyNameForPropertyNameNode,
   getPropertyNameForUniqueESSymbol,
+  getPropertyNameFromType,
   getPropertyNameOfBindingOrAssignmentElement,
   getPropertySymbolFromBindingElement,
   getPropertySymbolsFromContextualType,
@@ -188087,6 +188190,7 @@ start(initializeNodeSystem(), require("os").platform());
   isTypeQueryNode,
   isTypeReferenceNode,
   isTypeReferenceType,
+  isTypeUsableAsPropertyName,
   isUMDExportSymbol,
   isUnaryExpression,
   isUnaryExpressionWithWrite,