@typescript-deploys/pr-build 5.0.0-pr-52737-7 → 5.0.0-pr-49627-28

package/lib/tsc.js

@@ -47824,7 +47824,7 @@ function createTypeChecker(host) {
       );
     }
     function signatureToSignatureDeclarationHelper(signature, kind, context, options) {
-      var _a2, _b, _c, _d;
+      var _a2, _b, _c, _d, _e;
       const suppressAny = context.flags & 256 /* SuppressAnyReturnType */;
       if (suppressAny)
         context.flags &= ~256 /* SuppressAnyReturnType */;
@@ -47841,6 +47841,29 @@ function createTypeChecker(host) {
         /*skipUnionExpanding*/
         true
       )[0];
+      let restoreEnclosingDeclaration;
+      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
+        const locals = (_a2 = context.fakeScopeLocals) != null ? _a2 : context.fakeScopeLocals = createSymbolTable();
+        let newLocals;
+        for (const param of expandedParams) {
+          if (!locals.has(param.escapedName)) {
+            newLocals = append(newLocals, param.escapedName);
+            locals.set(param.escapedName, param);
+          }
+        }
+        if (newLocals) {
+          const fakeScope = parseNodeFactory.createBlock(emptyArray);
+          getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+          fakeScope.locals = locals;
+          const saveEnclosingDeclaration = context.enclosingDeclaration;
+          setParent(fakeScope, saveEnclosingDeclaration);
+          context.enclosingDeclaration = fakeScope;
+          restoreEnclosingDeclaration = () => {
+            context.enclosingDeclaration = saveEnclosingDeclaration;
+            forEach(newLocals, (s) => locals.delete(s));
+          };
+        }
+      }
       const parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 173 /* Constructor */, options == null ? void 0 : options.privateSymbolVisitor, options == null ? void 0 : options.bundledImports));
       const thisParameter = context.flags & 33554432 /* OmitThisParameter */ ? void 0 : tryGetThisParameterDeclaration(signature, context);
       if (thisParameter) {
@@ -47866,11 +47889,11 @@ function createTypeChecker(host) {
         const flags = modifiersToFlags(modifiers);
         modifiers = factory.createModifiersFromModifierFlags(flags | 256 /* Abstract */);
       }
-      const node = kind === 176 /* CallSignature */ ? factory.createCallSignature(typeParameters, parameters, returnTypeNode) : kind === 177 /* ConstructSignature */ ? factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : kind === 170 /* MethodSignature */ ? factory.createMethodSignature(modifiers, (_a2 = options == null ? void 0 : options.name) != null ? _a2 : factory.createIdentifier(""), options == null ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : kind === 171 /* MethodDeclaration */ ? factory.createMethodDeclaration(
+      const node = kind === 176 /* CallSignature */ ? factory.createCallSignature(typeParameters, parameters, returnTypeNode) : kind === 177 /* ConstructSignature */ ? factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : kind === 170 /* MethodSignature */ ? factory.createMethodSignature(modifiers, (_b = options == null ? void 0 : options.name) != null ? _b : factory.createIdentifier(""), options == null ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : kind === 171 /* MethodDeclaration */ ? factory.createMethodDeclaration(
         modifiers,
         /*asteriskToken*/
         void 0,
-        (_b = options == null ? void 0 : options.name) != null ? _b : factory.createIdentifier(""),
+        (_c = options == null ? void 0 : options.name) != null ? _c : factory.createIdentifier(""),
         /*questionToken*/
         void 0,
         typeParameters,
@@ -47885,14 +47908,14 @@ function createTypeChecker(host) {
         void 0
       ) : kind === 174 /* GetAccessor */ ? factory.createGetAccessorDeclaration(
         modifiers,
-        (_c = options == null ? void 0 : options.name) != null ? _c : factory.createIdentifier(""),
+        (_d = options == null ? void 0 : options.name) != null ? _d : factory.createIdentifier(""),
         parameters,
         returnTypeNode,
         /*body*/
         void 0
       ) : kind === 175 /* SetAccessor */ ? factory.createSetAccessorDeclaration(
         modifiers,
-        (_d = options == null ? void 0 : options.name) != null ? _d : factory.createIdentifier(""),
+        (_e = options == null ? void 0 : options.name) != null ? _e : factory.createIdentifier(""),
         parameters,
         /*body*/
         void 0
@@ -47927,6 +47950,7 @@ function createTypeChecker(host) {
       if (typeArguments) {
         node.typeArguments = factory.createNodeArray(typeArguments);
       }
+      restoreEnclosingDeclaration == null ? void 0 : restoreEnclosingDeclaration();
       return node;
     }
     function tryGetThisParameterDeclaration(signature, context) {
@@ -48541,9 +48565,12 @@ function createTypeChecker(host) {
     function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) {
       return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
     }
+    function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
+      return findAncestor(enclosingDeclaration, (n) => !getNodeLinks(n).fakeScopeForSignatureDeclaration);
+    }
     function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
       if (!isErrorType(type) && enclosingDeclaration) {
-        const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, enclosingDeclaration);
+        const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration));
         if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation) && !isGetAccessorDeclaration(declWithExistingAnnotation)) {
           const existing = getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
           if (typeNodeIsEquivalentToType(existing, declWithExistingAnnotation, type) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
@@ -48575,7 +48602,8 @@ function createTypeChecker(host) {
     function serializeReturnTypeForSignature(context, type, signature, includePrivateSymbol, bundled) {
       if (!isErrorType(type) && context.enclosingDeclaration) {
         const annotation = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
-        if (!!findAncestor(annotation, (n) => n === context.enclosingDeclaration) && annotation) {
+        const enclosingDeclarationIgnoringFakeScope = getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
+        if (!!findAncestor(annotation, (n) => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
           const annotated = getTypeFromTypeNode(annotation);
           const thisInstantiated = annotated.flags & 262144 /* TypeParameter */ && annotated.isThisType ? instantiateType(annotated, signature.mapper) : annotated;
           if (thisInstantiated === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(annotation, type)) {
@@ -63066,7 +63094,6 @@ function createTypeChecker(host) {
       if (getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
         const constraintType = getConstraintTypeFromMappedType(target);
         if (inferToMappedType(source, target, constraintType)) {
-          inferFromMappedProperties(source, target);
           return;
         }
       }
@@ -63167,19 +63194,6 @@ function createTypeChecker(host) {
         }
       }
     }
-    function inferFromMappedProperties(source, target) {
-      const properties = getPropertiesOfObjectType(source);
-      for (const sourceProp of properties) {
-        if (!some(sourceProp.declarations, hasSkipDirectInferenceFlag)) {
-          const sourcePropType = getTypeOfSymbol(sourceProp);
-          if (!couldContainTypeVariables(sourcePropType)) {
-            continue;
-          }
-          const targetPropType = substituteIndexedMappedType(target, getStringLiteralType(unescapeLeadingUnderscores(sourceProp.escapedName)));
-          inferFromTypes(sourcePropType, targetPropType);
-        }
-      }
-    }
     function inferFromSignatures(source, target, kind) {
       const sourceSignatures = getSignaturesOfType(source, kind);
       const targetSignatures = getSignaturesOfType(target, kind);
@@ -87651,7 +87665,16 @@ function transformClassFields(context) {
         visitNode(node.initializer, (child) => namedEvaluationVisitor(child, referencedName), isExpression)
       );
     }
-    return visitEachChild(node, visitor, context);
+    return factory2.updatePropertyDeclaration(
+      node,
+      visitNodes2(node.modifiers, modifierVisitor, isModifier),
+      visitNode(node.name, propertyNameVisitor, isPropertyName),
+      /*questionOrExclamationToken*/
+      void 0,
+      /*type*/
+      void 0,
+      visitNode(node.initializer, visitor, isExpression)
+    );
   }
   function transformPublicFieldInitializer(node) {
     if (shouldTransformInitializers && !isAutoAccessorPropertyDeclaration(node)) {

package/lib/tsserver.js

@@ -52400,7 +52400,7 @@ function createTypeChecker(host) {
       );
     }
     function signatureToSignatureDeclarationHelper(signature, kind, context, options) {
-      var _a2, _b, _c, _d;
+      var _a2, _b, _c, _d, _e;
       const suppressAny = context.flags & 256 /* SuppressAnyReturnType */;
       if (suppressAny)
         context.flags &= ~256 /* SuppressAnyReturnType */;
@@ -52417,6 +52417,29 @@ function createTypeChecker(host) {
         /*skipUnionExpanding*/
         true
       )[0];
+      let restoreEnclosingDeclaration;
+      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
+        const locals = (_a2 = context.fakeScopeLocals) != null ? _a2 : context.fakeScopeLocals = createSymbolTable();
+        let newLocals;
+        for (const param of expandedParams) {
+          if (!locals.has(param.escapedName)) {
+            newLocals = append(newLocals, param.escapedName);
+            locals.set(param.escapedName, param);
+          }
+        }
+        if (newLocals) {
+          const fakeScope = parseNodeFactory.createBlock(emptyArray);
+          getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+          fakeScope.locals = locals;
+          const saveEnclosingDeclaration = context.enclosingDeclaration;
+          setParent(fakeScope, saveEnclosingDeclaration);
+          context.enclosingDeclaration = fakeScope;
+          restoreEnclosingDeclaration = () => {
+            context.enclosingDeclaration = saveEnclosingDeclaration;
+            forEach(newLocals, (s) => locals.delete(s));
+          };
+        }
+      }
       const parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 173 /* Constructor */, options == null ? void 0 : options.privateSymbolVisitor, options == null ? void 0 : options.bundledImports));
       const thisParameter = context.flags & 33554432 /* OmitThisParameter */ ? void 0 : tryGetThisParameterDeclaration(signature, context);
       if (thisParameter) {
@@ -52442,11 +52465,11 @@ function createTypeChecker(host) {
         const flags = modifiersToFlags(modifiers);
         modifiers = factory.createModifiersFromModifierFlags(flags | 256 /* Abstract */);
       }
-      const node = kind === 176 /* CallSignature */ ? factory.createCallSignature(typeParameters, parameters, returnTypeNode) : kind === 177 /* ConstructSignature */ ? factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : kind === 170 /* MethodSignature */ ? factory.createMethodSignature(modifiers, (_a2 = options == null ? void 0 : options.name) != null ? _a2 : factory.createIdentifier(""), options == null ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : kind === 171 /* MethodDeclaration */ ? factory.createMethodDeclaration(
+      const node = kind === 176 /* CallSignature */ ? factory.createCallSignature(typeParameters, parameters, returnTypeNode) : kind === 177 /* ConstructSignature */ ? factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : kind === 170 /* MethodSignature */ ? factory.createMethodSignature(modifiers, (_b = options == null ? void 0 : options.name) != null ? _b : factory.createIdentifier(""), options == null ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : kind === 171 /* MethodDeclaration */ ? factory.createMethodDeclaration(
         modifiers,
         /*asteriskToken*/
         void 0,
-        (_b = options == null ? void 0 : options.name) != null ? _b : factory.createIdentifier(""),
+        (_c = options == null ? void 0 : options.name) != null ? _c : factory.createIdentifier(""),
         /*questionToken*/
         void 0,
         typeParameters,
@@ -52461,14 +52484,14 @@ function createTypeChecker(host) {
         void 0
       ) : kind === 174 /* GetAccessor */ ? factory.createGetAccessorDeclaration(
         modifiers,
-        (_c = options == null ? void 0 : options.name) != null ? _c : factory.createIdentifier(""),
+        (_d = options == null ? void 0 : options.name) != null ? _d : factory.createIdentifier(""),
         parameters,
         returnTypeNode,
         /*body*/
         void 0
       ) : kind === 175 /* SetAccessor */ ? factory.createSetAccessorDeclaration(
         modifiers,
-        (_d = options == null ? void 0 : options.name) != null ? _d : factory.createIdentifier(""),
+        (_e = options == null ? void 0 : options.name) != null ? _e : factory.createIdentifier(""),
         parameters,
         /*body*/
         void 0
@@ -52503,6 +52526,7 @@ function createTypeChecker(host) {
       if (typeArguments) {
         node.typeArguments = factory.createNodeArray(typeArguments);
       }
+      restoreEnclosingDeclaration == null ? void 0 : restoreEnclosingDeclaration();
       return node;
     }
     function tryGetThisParameterDeclaration(signature, context) {
@@ -53117,9 +53141,12 @@ function createTypeChecker(host) {
     function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) {
       return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
     }
+    function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
+      return findAncestor(enclosingDeclaration, (n) => !getNodeLinks(n).fakeScopeForSignatureDeclaration);
+    }
     function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
       if (!isErrorType(type) && enclosingDeclaration) {
-        const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, enclosingDeclaration);
+        const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration));
         if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation) && !isGetAccessorDeclaration(declWithExistingAnnotation)) {
           const existing = getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
           if (typeNodeIsEquivalentToType(existing, declWithExistingAnnotation, type) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
@@ -53151,7 +53178,8 @@ function createTypeChecker(host) {
     function serializeReturnTypeForSignature(context, type, signature, includePrivateSymbol, bundled) {
       if (!isErrorType(type) && context.enclosingDeclaration) {
         const annotation = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
-        if (!!findAncestor(annotation, (n) => n === context.enclosingDeclaration) && annotation) {
+        const enclosingDeclarationIgnoringFakeScope = getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
+        if (!!findAncestor(annotation, (n) => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
           const annotated = getTypeFromTypeNode(annotation);
           const thisInstantiated = annotated.flags & 262144 /* TypeParameter */ && annotated.isThisType ? instantiateType(annotated, signature.mapper) : annotated;
           if (thisInstantiated === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(annotation, type)) {
@@ -67642,7 +67670,6 @@ function createTypeChecker(host) {
       if (getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
         const constraintType = getConstraintTypeFromMappedType(target);
         if (inferToMappedType(source, target, constraintType)) {
-          inferFromMappedProperties(source, target);
           return;
         }
       }
@@ -67743,19 +67770,6 @@ function createTypeChecker(host) {
         }
       }
     }
-    function inferFromMappedProperties(source, target) {
-      const properties = getPropertiesOfObjectType(source);
-      for (const sourceProp of properties) {
-        if (!some(sourceProp.declarations, hasSkipDirectInferenceFlag)) {
-          const sourcePropType = getTypeOfSymbol(sourceProp);
-          if (!couldContainTypeVariables(sourcePropType)) {
-            continue;
-          }
-          const targetPropType = substituteIndexedMappedType(target, getStringLiteralType(unescapeLeadingUnderscores(sourceProp.escapedName)));
-          inferFromTypes(sourcePropType, targetPropType);
-        }
-      }
-    }
     function inferFromSignatures(source, target, kind) {
       const sourceSignatures = getSignaturesOfType(source, kind);
       const targetSignatures = getSignaturesOfType(target, kind);
@@ -92398,7 +92412,16 @@ function transformClassFields(context) {
         visitNode(node.initializer, (child) => namedEvaluationVisitor(child, referencedName), isExpression)
       );
     }
-    return visitEachChild(node, visitor, context);
+    return factory2.updatePropertyDeclaration(
+      node,
+      visitNodes2(node.modifiers, modifierVisitor, isModifier),
+      visitNode(node.name, propertyNameVisitor, isPropertyName),
+      /*questionOrExclamationToken*/
+      void 0,
+      /*type*/
+      void 0,
+      visitNode(node.initializer, visitor, isExpression)
+    );
   }
   function transformPublicFieldInitializer(node) {
     if (shouldTransformInitializers && !isAutoAccessorPropertyDeclaration(node)) {
@@ -135445,7 +135468,8 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       options.triggerCharacter,
       options.triggerKind,
       cancellationToken,
-      formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host)
+      formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host),
+      options.includeSymbol
     );
   }
   function getCompletionEntryDetails2(fileName, position, name, formattingOptions, source, preferences = emptyOptions, data) {
@@ -148273,7 +148297,7 @@ function resolvingModuleSpecifiers(logPrefix, host, resolver, program, position,
     return result2 || (needsFullResolution ? "failed" : "skipped");
   }
 }
-function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext) {
+function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext, includeSymbol = false) {
   var _a2;
   const { previousToken } = getRelevantTokens(position, sourceFile);
   if (triggerCharacter && !isInString(sourceFile, position, previousToken) && !isValidTrigger(sourceFile, triggerCharacter, previousToken, position)) {
@@ -148295,7 +148319,7 @@ function getCompletionsAtPosition(host, program, log, sourceFile, position, pref
   } else {
     incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.clear();
   }
-  const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences);
+  const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences, includeSymbol);
   if (stringCompletions) {
     return stringCompletions;
   }
@@ -148320,7 +148344,7 @@ function getCompletionsAtPosition(host, program, log, sourceFile, position, pref
   }
   switch (completionData.kind) {
     case 0 /* Data */:
-      const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position);
+      const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol);
       if (response == null ? void 0 : response.isIncomplete) {
         incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.set(response);
       }
@@ -148450,7 +148474,7 @@ function keywordFiltersFromSyntaxKind(keywordCompletion) {
 function getOptionalReplacementSpan(location) {
   return (location == null ? void 0 : location.kind) === 79 /* Identifier */ ? createTextSpanFromNode(location) : void 0;
 }
-function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position) {
+function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol) {
   const {
     symbols,
     contextToken,
@@ -148524,7 +148548,8 @@ function completionInfoFromData(sourceFile, host, program, compilerOptions, log,
     symbolToOriginInfoMap,
     symbolToSortTextMap,
     isJsxIdentifierExpected,
-    isRightOfOpenTag
+    isRightOfOpenTag,
+    includeSymbol
   );
   if (keywordFilters !== 0 /* None */) {
     for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
@@ -148773,7 +148798,7 @@ function completionNameForLiteral(sourceFile, preferences, literal) {
 function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
   return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
 }
-function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag) {
+function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol) {
   let insertText;
   let replacementSpan = getReplacementSpanForContextToken(replacementToken);
   let data;
@@ -148817,7 +148842,9 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
     }
     awaitText += `(await ${propertyAccessToConvert.expression.getText()})`;
     insertText = needsConvertPropertyAccess ? `${awaitText}${insertText}` : `${awaitText}${insertQuestionDot ? "?." : "."}${insertText}`;
-    replacementSpan = createTextSpanFromBounds(propertyAccessToConvert.getStart(sourceFile), propertyAccessToConvert.end);
+    const isInAwaitExpression = tryCast(propertyAccessToConvert.parent, isAwaitExpression);
+    const wrapNode = isInAwaitExpression ? propertyAccessToConvert.parent : propertyAccessToConvert.expression;
+    replacementSpan = createTextSpanFromBounds(wrapNode.getStart(sourceFile), propertyAccessToConvert.end);
   }
   if (originIsResolvedExport(origin)) {
     sourceDisplay = [textPart(origin.moduleSpecifier)];
@@ -148885,7 +148912,8 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
     isSnippet,
     isPackageJsonImport: originIsPackageJsonImport(origin) || void 0,
     isImportStatementCompletion: !!importStatementCompletion || void 0,
-    data
+    data,
+    ...includeSymbol ? { symbol } : void 0
   };
 }
 function isClassLikeMemberCompletion(symbol, location, sourceFile) {
@@ -149355,7 +149383,7 @@ function getSourceFromOrigin(origin) {
     return "TypeOnlyAlias/" /* TypeOnlyAlias */;
   }
 }
-function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag) {
+function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
   var _a2;
   const start2 = timestamp();
   const variableDeclaration = getVariableDeclaration(location);
@@ -149395,7 +149423,8 @@ function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, con
       kind,
       formatContext,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (!entry) {
       continue;
@@ -151594,7 +151623,7 @@ function createNameAndKindSet() {
     values: map2.values.bind(map2)
   };
 }
-function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences) {
+function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences, includeSymbol) {
   if (isInReferenceComment(sourceFile, position)) {
     const entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
     return entries && convertPathCompletions(entries);
@@ -151603,10 +151632,10 @@ function getStringLiteralCompletions(sourceFile, position, contextToken, options
     if (!contextToken || !isStringLiteralLike(contextToken))
       return void 0;
     const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program.getTypeChecker(), options, host, preferences);
-    return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position);
+    return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol);
   }
 }
-function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position) {
+function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol) {
   if (completion === void 0) {
     return void 0;
   }
@@ -151632,7 +151661,28 @@ function convertStringLiteralCompletions(completion, contextToken, sourceFile, h
         preferences,
         options,
         /*formatContext*/
-        void 0
+        void 0,
+        /*isTypeOnlyLocation */
+        void 0,
+        /*propertyAccessToConvert*/
+        void 0,
+        /*jsxIdentifierExpected*/
+        void 0,
+        /*isJsxInitializer*/
+        void 0,
+        /*importStatementCompletion*/
+        void 0,
+        /*recommendedCompletion*/
+        void 0,
+        /*symbolToOriginInfoMap*/
+        void 0,
+        /*symbolToSortTextMap*/
+        void 0,
+        /*isJsxIdentifierExpected*/
+        void 0,
+        /*isRightOfOpenTag*/
+        void 0,
+        includeSymbol
       );
       return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan, entries };
     }

package/lib/tsserverlibrary.d.ts

@@ -10073,6 +10073,13 @@ declare namespace ts {
          */
         triggerCharacter?: CompletionsTriggerCharacter;
         triggerKind?: CompletionTriggerKind;
+        /**
+         * Include a `symbol` property on each completion entry object.
+         * Symbols reference cyclic data structures and sometimes an entire TypeChecker instance,
+         * so use caution when serializing or retaining completion entries retrieved with this option.
+         * @default false
+         */
+        includeSymbol?: boolean;
         /** @deprecated Use includeCompletionsForModuleExports */
         includeExternalModuleExports?: boolean;
         /** @deprecated Use includeCompletionsWithInsertText */
@@ -10630,6 +10637,12 @@ declare namespace ts {
         isFromUncheckedFile?: true;
         isPackageJsonImport?: true;
         isImportStatementCompletion?: true;
+        /**
+         * For API purposes.
+         * Included for non-string completions only when `includeSymbol: true` option is passed to `getCompletionsAtPosition`.
+         * @example Get declaration of completion: `symbol.valueDeclaration`
+         */
+        symbol?: Symbol;
         /**
          * A property to be sent back to TS Server in the CompletionDetailsRequest, along with `name`,
          * that allows TS Server to look up the symbol represented by the completion item, disambiguating

package/lib/tsserverlibrary.js

@@ -50209,7 +50209,7 @@ ${lanes.join("\n")}
         );
       }
       function signatureToSignatureDeclarationHelper(signature, kind, context, options) {
-        var _a2, _b, _c, _d;
+        var _a2, _b, _c, _d, _e;
         const suppressAny = context.flags & 256 /* SuppressAnyReturnType */;
         if (suppressAny)
           context.flags &= ~256 /* SuppressAnyReturnType */;
@@ -50226,6 +50226,29 @@ ${lanes.join("\n")}
           /*skipUnionExpanding*/
           true
         )[0];
+        let restoreEnclosingDeclaration;
+        if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
+          const locals = (_a2 = context.fakeScopeLocals) != null ? _a2 : context.fakeScopeLocals = createSymbolTable();
+          let newLocals;
+          for (const param of expandedParams) {
+            if (!locals.has(param.escapedName)) {
+              newLocals = append(newLocals, param.escapedName);
+              locals.set(param.escapedName, param);
+            }
+          }
+          if (newLocals) {
+            const fakeScope = parseNodeFactory.createBlock(emptyArray);
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+            fakeScope.locals = locals;
+            const saveEnclosingDeclaration = context.enclosingDeclaration;
+            setParent(fakeScope, saveEnclosingDeclaration);
+            context.enclosingDeclaration = fakeScope;
+            restoreEnclosingDeclaration = () => {
+              context.enclosingDeclaration = saveEnclosingDeclaration;
+              forEach(newLocals, (s) => locals.delete(s));
+            };
+          }
+        }
         const parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 173 /* Constructor */, options == null ? void 0 : options.privateSymbolVisitor, options == null ? void 0 : options.bundledImports));
         const thisParameter = context.flags & 33554432 /* OmitThisParameter */ ? void 0 : tryGetThisParameterDeclaration(signature, context);
         if (thisParameter) {
@@ -50251,11 +50274,11 @@ ${lanes.join("\n")}
           const flags = modifiersToFlags(modifiers);
           modifiers = factory.createModifiersFromModifierFlags(flags | 256 /* Abstract */);
         }
-        const node = kind === 176 /* CallSignature */ ? factory.createCallSignature(typeParameters, parameters, returnTypeNode) : kind === 177 /* ConstructSignature */ ? factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : kind === 170 /* MethodSignature */ ? factory.createMethodSignature(modifiers, (_a2 = options == null ? void 0 : options.name) != null ? _a2 : factory.createIdentifier(""), options == null ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : kind === 171 /* MethodDeclaration */ ? factory.createMethodDeclaration(
+        const node = kind === 176 /* CallSignature */ ? factory.createCallSignature(typeParameters, parameters, returnTypeNode) : kind === 177 /* ConstructSignature */ ? factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : kind === 170 /* MethodSignature */ ? factory.createMethodSignature(modifiers, (_b = options == null ? void 0 : options.name) != null ? _b : factory.createIdentifier(""), options == null ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : kind === 171 /* MethodDeclaration */ ? factory.createMethodDeclaration(
           modifiers,
           /*asteriskToken*/
           void 0,
-          (_b = options == null ? void 0 : options.name) != null ? _b : factory.createIdentifier(""),
+          (_c = options == null ? void 0 : options.name) != null ? _c : factory.createIdentifier(""),
           /*questionToken*/
           void 0,
           typeParameters,
@@ -50270,14 +50293,14 @@ ${lanes.join("\n")}
           void 0
         ) : kind === 174 /* GetAccessor */ ? factory.createGetAccessorDeclaration(
           modifiers,
-          (_c = options == null ? void 0 : options.name) != null ? _c : factory.createIdentifier(""),
+          (_d = options == null ? void 0 : options.name) != null ? _d : factory.createIdentifier(""),
           parameters,
           returnTypeNode,
           /*body*/
           void 0
         ) : kind === 175 /* SetAccessor */ ? factory.createSetAccessorDeclaration(
           modifiers,
-          (_d = options == null ? void 0 : options.name) != null ? _d : factory.createIdentifier(""),
+          (_e = options == null ? void 0 : options.name) != null ? _e : factory.createIdentifier(""),
           parameters,
           /*body*/
           void 0
@@ -50312,6 +50335,7 @@ ${lanes.join("\n")}
         if (typeArguments) {
           node.typeArguments = factory.createNodeArray(typeArguments);
         }
+        restoreEnclosingDeclaration == null ? void 0 : restoreEnclosingDeclaration();
         return node;
       }
       function tryGetThisParameterDeclaration(signature, context) {
@@ -50926,9 +50950,12 @@ ${lanes.join("\n")}
       function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) {
         return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
       }
+      function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
+        return findAncestor(enclosingDeclaration, (n) => !getNodeLinks(n).fakeScopeForSignatureDeclaration);
+      }
       function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
         if (!isErrorType(type) && enclosingDeclaration) {
-          const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, enclosingDeclaration);
+          const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration));
           if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation) && !isGetAccessorDeclaration(declWithExistingAnnotation)) {
             const existing = getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
             if (typeNodeIsEquivalentToType(existing, declWithExistingAnnotation, type) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
@@ -50960,7 +50987,8 @@ ${lanes.join("\n")}
       function serializeReturnTypeForSignature(context, type, signature, includePrivateSymbol, bundled) {
         if (!isErrorType(type) && context.enclosingDeclaration) {
           const annotation = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
-          if (!!findAncestor(annotation, (n) => n === context.enclosingDeclaration) && annotation) {
+          const enclosingDeclarationIgnoringFakeScope = getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
+          if (!!findAncestor(annotation, (n) => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
             const annotated = getTypeFromTypeNode(annotation);
             const thisInstantiated = annotated.flags & 262144 /* TypeParameter */ && annotated.isThisType ? instantiateType(annotated, signature.mapper) : annotated;
             if (thisInstantiated === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(annotation, type)) {
@@ -65451,7 +65479,6 @@ ${lanes.join("\n")}
         if (getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
           const constraintType = getConstraintTypeFromMappedType(target);
           if (inferToMappedType(source, target, constraintType)) {
-            inferFromMappedProperties(source, target);
             return;
           }
         }
@@ -65552,19 +65579,6 @@ ${lanes.join("\n")}
           }
         }
       }
-      function inferFromMappedProperties(source, target) {
-        const properties = getPropertiesOfObjectType(source);
-        for (const sourceProp of properties) {
-          if (!some(sourceProp.declarations, hasSkipDirectInferenceFlag)) {
-            const sourcePropType = getTypeOfSymbol(sourceProp);
-            if (!couldContainTypeVariables(sourcePropType)) {
-              continue;
-            }
-            const targetPropType = substituteIndexedMappedType(target, getStringLiteralType(unescapeLeadingUnderscores(sourceProp.escapedName)));
-            inferFromTypes(sourcePropType, targetPropType);
-          }
-        }
-      }
       function inferFromSignatures(source, target, kind) {
         const sourceSignatures = getSignaturesOfType(source, kind);
         const targetSignatures = getSignaturesOfType(target, kind);
@@ -90383,7 +90397,16 @@ ${lanes.join("\n")}
           visitNode(node.initializer, (child) => namedEvaluationVisitor(child, referencedName), isExpression)
         );
       }
-      return visitEachChild(node, visitor, context);
+      return factory2.updatePropertyDeclaration(
+        node,
+        visitNodes2(node.modifiers, modifierVisitor, isModifier),
+        visitNode(node.name, propertyNameVisitor, isPropertyName),
+        /*questionOrExclamationToken*/
+        void 0,
+        /*type*/
+        void 0,
+        visitNode(node.initializer, visitor, isExpression)
+      );
     }
     function transformPublicFieldInitializer(node) {
       if (shouldTransformInitializers && !isAutoAccessorPropertyDeclaration(node)) {
@@ -133213,7 +133236,8 @@ ${lanes.join("\n")}
         options.triggerCharacter,
         options.triggerKind,
         cancellationToken,
-        formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host)
+        formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host),
+        options.includeSymbol
       );
     }
     function getCompletionEntryDetails2(fileName, position, name, formattingOptions, source, preferences = emptyOptions, data) {
@@ -147328,7 +147352,7 @@ ${lanes.join("\n")}
       return result2 || (needsFullResolution ? "failed" : "skipped");
     }
   }
-  function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext) {
+  function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext, includeSymbol = false) {
     var _a2;
     const { previousToken } = getRelevantTokens(position, sourceFile);
     if (triggerCharacter && !isInString(sourceFile, position, previousToken) && !isValidTrigger(sourceFile, triggerCharacter, previousToken, position)) {
@@ -147350,7 +147374,7 @@ ${lanes.join("\n")}
     } else {
       incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.clear();
     }
-    const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences);
+    const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences, includeSymbol);
     if (stringCompletions) {
       return stringCompletions;
     }
@@ -147375,7 +147399,7 @@ ${lanes.join("\n")}
     }
     switch (completionData.kind) {
       case 0 /* Data */:
-        const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position);
+        const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol);
         if (response == null ? void 0 : response.isIncomplete) {
           incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.set(response);
         }
@@ -147505,7 +147529,7 @@ ${lanes.join("\n")}
   function getOptionalReplacementSpan(location) {
     return (location == null ? void 0 : location.kind) === 79 /* Identifier */ ? createTextSpanFromNode(location) : void 0;
   }
-  function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position) {
+  function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol) {
     const {
       symbols,
       contextToken,
@@ -147579,7 +147603,8 @@ ${lanes.join("\n")}
       symbolToOriginInfoMap,
       symbolToSortTextMap,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (keywordFilters !== 0 /* None */) {
       for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
@@ -147828,7 +147853,7 @@ ${lanes.join("\n")}
   function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
     return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
   }
-  function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag) {
+  function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol) {
     let insertText;
     let replacementSpan = getReplacementSpanForContextToken(replacementToken);
     let data;
@@ -147872,7 +147897,9 @@ ${lanes.join("\n")}
       }
       awaitText += `(await ${propertyAccessToConvert.expression.getText()})`;
       insertText = needsConvertPropertyAccess ? `${awaitText}${insertText}` : `${awaitText}${insertQuestionDot ? "?." : "."}${insertText}`;
-      replacementSpan = createTextSpanFromBounds(propertyAccessToConvert.getStart(sourceFile), propertyAccessToConvert.end);
+      const isInAwaitExpression = tryCast(propertyAccessToConvert.parent, isAwaitExpression);
+      const wrapNode = isInAwaitExpression ? propertyAccessToConvert.parent : propertyAccessToConvert.expression;
+      replacementSpan = createTextSpanFromBounds(wrapNode.getStart(sourceFile), propertyAccessToConvert.end);
     }
     if (originIsResolvedExport(origin)) {
       sourceDisplay = [textPart(origin.moduleSpecifier)];
@@ -147940,7 +147967,8 @@ ${lanes.join("\n")}
       isSnippet,
       isPackageJsonImport: originIsPackageJsonImport(origin) || void 0,
       isImportStatementCompletion: !!importStatementCompletion || void 0,
-      data
+      data,
+      ...includeSymbol ? { symbol } : void 0
     };
   }
   function isClassLikeMemberCompletion(symbol, location, sourceFile) {
@@ -148410,7 +148438,7 @@ ${lanes.join("\n")}
       return "TypeOnlyAlias/" /* TypeOnlyAlias */;
     }
   }
-  function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag) {
+  function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
     var _a2;
     const start = timestamp();
     const variableDeclaration = getVariableDeclaration(location);
@@ -148450,7 +148478,8 @@ ${lanes.join("\n")}
         kind,
         formatContext,
         isJsxIdentifierExpected,
-        isRightOfOpenTag
+        isRightOfOpenTag,
+        includeSymbol
       );
       if (!entry) {
         continue;
@@ -150691,7 +150720,7 @@ ${lanes.join("\n")}
       values: map2.values.bind(map2)
     };
   }
-  function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences) {
+  function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences, includeSymbol) {
     if (isInReferenceComment(sourceFile, position)) {
       const entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
       return entries && convertPathCompletions(entries);
@@ -150700,10 +150729,10 @@ ${lanes.join("\n")}
       if (!contextToken || !isStringLiteralLike(contextToken))
         return void 0;
       const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program.getTypeChecker(), options, host, preferences);
-      return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position);
+      return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol);
     }
   }
-  function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position) {
+  function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol) {
     if (completion === void 0) {
       return void 0;
     }
@@ -150729,7 +150758,28 @@ ${lanes.join("\n")}
           preferences,
           options,
           /*formatContext*/
-          void 0
+          void 0,
+          /*isTypeOnlyLocation */
+          void 0,
+          /*propertyAccessToConvert*/
+          void 0,
+          /*jsxIdentifierExpected*/
+          void 0,
+          /*isJsxInitializer*/
+          void 0,
+          /*importStatementCompletion*/
+          void 0,
+          /*recommendedCompletion*/
+          void 0,
+          /*symbolToOriginInfoMap*/
+          void 0,
+          /*symbolToSortTextMap*/
+          void 0,
+          /*isJsxIdentifierExpected*/
+          void 0,
+          /*isRightOfOpenTag*/
+          void 0,
+          includeSymbol
         );
         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan, entries };
       }

package/lib/typescript.d.ts

@@ -6171,6 +6171,13 @@ declare namespace ts {
          */
         triggerCharacter?: CompletionsTriggerCharacter;
         triggerKind?: CompletionTriggerKind;
+        /**
+         * Include a `symbol` property on each completion entry object.
+         * Symbols reference cyclic data structures and sometimes an entire TypeChecker instance,
+         * so use caution when serializing or retaining completion entries retrieved with this option.
+         * @default false
+         */
+        includeSymbol?: boolean;
         /** @deprecated Use includeCompletionsForModuleExports */
         includeExternalModuleExports?: boolean;
         /** @deprecated Use includeCompletionsWithInsertText */
@@ -6728,6 +6735,12 @@ declare namespace ts {
         isFromUncheckedFile?: true;
         isPackageJsonImport?: true;
         isImportStatementCompletion?: true;
+        /**
+         * For API purposes.
+         * Included for non-string completions only when `includeSymbol: true` option is passed to `getCompletionsAtPosition`.
+         * @example Get declaration of completion: `symbol.valueDeclaration`
+         */
+        symbol?: Symbol;
         /**
          * A property to be sent back to TS Server in the CompletionDetailsRequest, along with `name`,
          * that allows TS Server to look up the symbol represented by the completion item, disambiguating

package/lib/typescript.js

@@ -50209,7 +50209,7 @@ ${lanes.join("\n")}
         );
       }
       function signatureToSignatureDeclarationHelper(signature, kind, context, options) {
-        var _a2, _b, _c, _d;
+        var _a2, _b, _c, _d, _e;
         const suppressAny = context.flags & 256 /* SuppressAnyReturnType */;
         if (suppressAny)
           context.flags &= ~256 /* SuppressAnyReturnType */;
@@ -50226,6 +50226,29 @@ ${lanes.join("\n")}
           /*skipUnionExpanding*/
           true
         )[0];
+        let restoreEnclosingDeclaration;
+        if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
+          const locals = (_a2 = context.fakeScopeLocals) != null ? _a2 : context.fakeScopeLocals = createSymbolTable();
+          let newLocals;
+          for (const param of expandedParams) {
+            if (!locals.has(param.escapedName)) {
+              newLocals = append(newLocals, param.escapedName);
+              locals.set(param.escapedName, param);
+            }
+          }
+          if (newLocals) {
+            const fakeScope = parseNodeFactory.createBlock(emptyArray);
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+            fakeScope.locals = locals;
+            const saveEnclosingDeclaration = context.enclosingDeclaration;
+            setParent(fakeScope, saveEnclosingDeclaration);
+            context.enclosingDeclaration = fakeScope;
+            restoreEnclosingDeclaration = () => {
+              context.enclosingDeclaration = saveEnclosingDeclaration;
+              forEach(newLocals, (s) => locals.delete(s));
+            };
+          }
+        }
         const parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 173 /* Constructor */, options == null ? void 0 : options.privateSymbolVisitor, options == null ? void 0 : options.bundledImports));
         const thisParameter = context.flags & 33554432 /* OmitThisParameter */ ? void 0 : tryGetThisParameterDeclaration(signature, context);
         if (thisParameter) {
@@ -50251,11 +50274,11 @@ ${lanes.join("\n")}
           const flags = modifiersToFlags(modifiers);
           modifiers = factory.createModifiersFromModifierFlags(flags | 256 /* Abstract */);
         }
-        const node = kind === 176 /* CallSignature */ ? factory.createCallSignature(typeParameters, parameters, returnTypeNode) : kind === 177 /* ConstructSignature */ ? factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : kind === 170 /* MethodSignature */ ? factory.createMethodSignature(modifiers, (_a2 = options == null ? void 0 : options.name) != null ? _a2 : factory.createIdentifier(""), options == null ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : kind === 171 /* MethodDeclaration */ ? factory.createMethodDeclaration(
+        const node = kind === 176 /* CallSignature */ ? factory.createCallSignature(typeParameters, parameters, returnTypeNode) : kind === 177 /* ConstructSignature */ ? factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : kind === 170 /* MethodSignature */ ? factory.createMethodSignature(modifiers, (_b = options == null ? void 0 : options.name) != null ? _b : factory.createIdentifier(""), options == null ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : kind === 171 /* MethodDeclaration */ ? factory.createMethodDeclaration(
           modifiers,
           /*asteriskToken*/
           void 0,
-          (_b = options == null ? void 0 : options.name) != null ? _b : factory.createIdentifier(""),
+          (_c = options == null ? void 0 : options.name) != null ? _c : factory.createIdentifier(""),
           /*questionToken*/
           void 0,
           typeParameters,
@@ -50270,14 +50293,14 @@ ${lanes.join("\n")}
           void 0
         ) : kind === 174 /* GetAccessor */ ? factory.createGetAccessorDeclaration(
           modifiers,
-          (_c = options == null ? void 0 : options.name) != null ? _c : factory.createIdentifier(""),
+          (_d = options == null ? void 0 : options.name) != null ? _d : factory.createIdentifier(""),
           parameters,
           returnTypeNode,
           /*body*/
           void 0
         ) : kind === 175 /* SetAccessor */ ? factory.createSetAccessorDeclaration(
           modifiers,
-          (_d = options == null ? void 0 : options.name) != null ? _d : factory.createIdentifier(""),
+          (_e = options == null ? void 0 : options.name) != null ? _e : factory.createIdentifier(""),
           parameters,
           /*body*/
           void 0
@@ -50312,6 +50335,7 @@ ${lanes.join("\n")}
         if (typeArguments) {
           node.typeArguments = factory.createNodeArray(typeArguments);
         }
+        restoreEnclosingDeclaration == null ? void 0 : restoreEnclosingDeclaration();
         return node;
       }
       function tryGetThisParameterDeclaration(signature, context) {
@@ -50926,9 +50950,12 @@ ${lanes.join("\n")}
       function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) {
         return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
       }
+      function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
+        return findAncestor(enclosingDeclaration, (n) => !getNodeLinks(n).fakeScopeForSignatureDeclaration);
+      }
       function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
         if (!isErrorType(type) && enclosingDeclaration) {
-          const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, enclosingDeclaration);
+          const declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration));
           if (declWithExistingAnnotation && !isFunctionLikeDeclaration(declWithExistingAnnotation) && !isGetAccessorDeclaration(declWithExistingAnnotation)) {
             const existing = getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
             if (typeNodeIsEquivalentToType(existing, declWithExistingAnnotation, type) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
@@ -50960,7 +50987,8 @@ ${lanes.join("\n")}
       function serializeReturnTypeForSignature(context, type, signature, includePrivateSymbol, bundled) {
         if (!isErrorType(type) && context.enclosingDeclaration) {
           const annotation = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
-          if (!!findAncestor(annotation, (n) => n === context.enclosingDeclaration) && annotation) {
+          const enclosingDeclarationIgnoringFakeScope = getEnclosingDeclarationIgnoringFakeScope(context.enclosingDeclaration);
+          if (!!findAncestor(annotation, (n) => n === enclosingDeclarationIgnoringFakeScope) && annotation) {
             const annotated = getTypeFromTypeNode(annotation);
             const thisInstantiated = annotated.flags & 262144 /* TypeParameter */ && annotated.isThisType ? instantiateType(annotated, signature.mapper) : annotated;
             if (thisInstantiated === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(annotation, type)) {
@@ -65451,7 +65479,6 @@ ${lanes.join("\n")}
         if (getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
           const constraintType = getConstraintTypeFromMappedType(target);
           if (inferToMappedType(source, target, constraintType)) {
-            inferFromMappedProperties(source, target);
             return;
           }
         }
@@ -65552,19 +65579,6 @@ ${lanes.join("\n")}
           }
         }
       }
-      function inferFromMappedProperties(source, target) {
-        const properties = getPropertiesOfObjectType(source);
-        for (const sourceProp of properties) {
-          if (!some(sourceProp.declarations, hasSkipDirectInferenceFlag)) {
-            const sourcePropType = getTypeOfSymbol(sourceProp);
-            if (!couldContainTypeVariables(sourcePropType)) {
-              continue;
-            }
-            const targetPropType = substituteIndexedMappedType(target, getStringLiteralType(unescapeLeadingUnderscores(sourceProp.escapedName)));
-            inferFromTypes(sourcePropType, targetPropType);
-          }
-        }
-      }
       function inferFromSignatures(source, target, kind) {
         const sourceSignatures = getSignaturesOfType(source, kind);
         const targetSignatures = getSignaturesOfType(target, kind);
@@ -90383,7 +90397,16 @@ ${lanes.join("\n")}
           visitNode(node.initializer, (child) => namedEvaluationVisitor(child, referencedName), isExpression)
         );
       }
-      return visitEachChild(node, visitor, context);
+      return factory2.updatePropertyDeclaration(
+        node,
+        visitNodes2(node.modifiers, modifierVisitor, isModifier),
+        visitNode(node.name, propertyNameVisitor, isPropertyName),
+        /*questionOrExclamationToken*/
+        void 0,
+        /*type*/
+        void 0,
+        visitNode(node.initializer, visitor, isExpression)
+      );
     }
     function transformPublicFieldInitializer(node) {
       if (shouldTransformInitializers && !isAutoAccessorPropertyDeclaration(node)) {
@@ -133227,7 +133250,8 @@ ${lanes.join("\n")}
         options.triggerCharacter,
         options.triggerKind,
         cancellationToken,
-        formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host)
+        formattingSettings && ts_formatting_exports.getFormatContext(formattingSettings, host),
+        options.includeSymbol
       );
     }
     function getCompletionEntryDetails2(fileName, position, name, formattingOptions, source, preferences = emptyOptions, data) {
@@ -147342,7 +147366,7 @@ ${lanes.join("\n")}
       return result2 || (needsFullResolution ? "failed" : "skipped");
     }
   }
-  function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext) {
+  function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext, includeSymbol = false) {
     var _a2;
     const { previousToken } = getRelevantTokens(position, sourceFile);
     if (triggerCharacter && !isInString(sourceFile, position, previousToken) && !isValidTrigger(sourceFile, triggerCharacter, previousToken, position)) {
@@ -147364,7 +147388,7 @@ ${lanes.join("\n")}
     } else {
       incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.clear();
     }
-    const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences);
+    const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences, includeSymbol);
     if (stringCompletions) {
       return stringCompletions;
     }
@@ -147389,7 +147413,7 @@ ${lanes.join("\n")}
     }
     switch (completionData.kind) {
       case 0 /* Data */:
-        const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position);
+        const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol);
         if (response == null ? void 0 : response.isIncomplete) {
           incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.set(response);
         }
@@ -147519,7 +147543,7 @@ ${lanes.join("\n")}
   function getOptionalReplacementSpan(location) {
     return (location == null ? void 0 : location.kind) === 79 /* Identifier */ ? createTextSpanFromNode(location) : void 0;
   }
-  function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position) {
+  function completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences, formatContext, position, includeSymbol) {
     const {
       symbols,
       contextToken,
@@ -147593,7 +147617,8 @@ ${lanes.join("\n")}
       symbolToOriginInfoMap,
       symbolToSortTextMap,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (keywordFilters !== 0 /* None */) {
       for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
@@ -147842,7 +147867,7 @@ ${lanes.join("\n")}
   function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
     return { name: completionNameForLiteral(sourceFile, preferences, literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
   }
-  function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag) {
+  function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol) {
     let insertText;
     let replacementSpan = getReplacementSpanForContextToken(replacementToken);
     let data;
@@ -147886,7 +147911,9 @@ ${lanes.join("\n")}
       }
       awaitText += `(await ${propertyAccessToConvert.expression.getText()})`;
       insertText = needsConvertPropertyAccess ? `${awaitText}${insertText}` : `${awaitText}${insertQuestionDot ? "?." : "."}${insertText}`;
-      replacementSpan = createTextSpanFromBounds(propertyAccessToConvert.getStart(sourceFile), propertyAccessToConvert.end);
+      const isInAwaitExpression = tryCast(propertyAccessToConvert.parent, isAwaitExpression);
+      const wrapNode = isInAwaitExpression ? propertyAccessToConvert.parent : propertyAccessToConvert.expression;
+      replacementSpan = createTextSpanFromBounds(wrapNode.getStart(sourceFile), propertyAccessToConvert.end);
     }
     if (originIsResolvedExport(origin)) {
       sourceDisplay = [textPart(origin.moduleSpecifier)];
@@ -147954,7 +147981,8 @@ ${lanes.join("\n")}
       isSnippet,
       isPackageJsonImport: originIsPackageJsonImport(origin) || void 0,
       isImportStatementCompletion: !!importStatementCompletion || void 0,
-      data
+      data,
+      ...includeSymbol ? { symbol } : void 0
     };
   }
   function isClassLikeMemberCompletion(symbol, location, sourceFile) {
@@ -148424,7 +148452,7 @@ ${lanes.join("\n")}
       return "TypeOnlyAlias/" /* TypeOnlyAlias */;
     }
   }
-  function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag) {
+  function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
     var _a2;
     const start = timestamp();
     const variableDeclaration = getVariableDeclaration(location);
@@ -148464,7 +148492,8 @@ ${lanes.join("\n")}
         kind,
         formatContext,
         isJsxIdentifierExpected,
-        isRightOfOpenTag
+        isRightOfOpenTag,
+        includeSymbol
       );
       if (!entry) {
         continue;
@@ -150705,7 +150734,7 @@ ${lanes.join("\n")}
       values: map2.values.bind(map2)
     };
   }
-  function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences) {
+  function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences, includeSymbol) {
     if (isInReferenceComment(sourceFile, position)) {
       const entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
       return entries && convertPathCompletions(entries);
@@ -150714,10 +150743,10 @@ ${lanes.join("\n")}
       if (!contextToken || !isStringLiteralLike(contextToken))
         return void 0;
       const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program.getTypeChecker(), options, host, preferences);
-      return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position);
+      return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol);
     }
   }
-  function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position) {
+  function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program, log, options, preferences, position, includeSymbol) {
     if (completion === void 0) {
       return void 0;
     }
@@ -150743,7 +150772,28 @@ ${lanes.join("\n")}
           preferences,
           options,
           /*formatContext*/
-          void 0
+          void 0,
+          /*isTypeOnlyLocation */
+          void 0,
+          /*propertyAccessToConvert*/
+          void 0,
+          /*jsxIdentifierExpected*/
+          void 0,
+          /*isJsxInitializer*/
+          void 0,
+          /*importStatementCompletion*/
+          void 0,
+          /*recommendedCompletion*/
+          void 0,
+          /*symbolToOriginInfoMap*/
+          void 0,
+          /*symbolToSortTextMap*/
+          void 0,
+          /*isJsxIdentifierExpected*/
+          void 0,
+          /*isRightOfOpenTag*/
+          void 0,
+          includeSymbol
         );
         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan, entries };
       }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.0.0-pr-52737-7",
+  "version": "5.0.0-pr-49627-28",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [