typescript 5.0.0-dev.20230216 → 5.0.0-dev.20230217

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230216`;
+var version = `${versionMajorMinor}.0-dev.20230217`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -24988,7 +24988,7 @@ function canHaveIllegalDecorators(node) {
 }
 function canHaveIllegalModifiers(node) {
   const kind = node.kind;
-  return kind === 172 /* ClassStaticBlockDeclaration */ || kind === 299 /* PropertyAssignment */ || kind === 300 /* ShorthandPropertyAssignment */ || kind === 181 /* FunctionType */ || kind === 279 /* MissingDeclaration */ || kind === 267 /* NamespaceExportDeclaration */;
+  return kind === 172 /* ClassStaticBlockDeclaration */ || kind === 299 /* PropertyAssignment */ || kind === 300 /* ShorthandPropertyAssignment */ || kind === 279 /* MissingDeclaration */ || kind === 267 /* NamespaceExportDeclaration */;
 }
 function isQuestionOrExclamationToken(node) {
   return isQuestionToken(node) || isExclamationToken(node);
@@ -28280,6 +28280,7 @@ var Parser;
     const hasJSDoc = hasPrecedingJSDocComment();
     const modifiers = parseModifiersForConstructorType();
     const isConstructorType = parseOptional(103 /* NewKeyword */);
+    Debug.assert(!modifiers || isConstructorType, "Per isStartOfFunctionOrConstructorType, a function type cannot have modifiers.");
     const typeParameters = parseTypeParameters();
     const parameters = parseParameters(4 /* Type */);
     const type = parseReturnType(
@@ -28288,8 +28289,6 @@ var Parser;
       false
     );
     const node = isConstructorType ? factory2.createConstructorTypeNode(modifiers, typeParameters, parameters, type) : factory2.createFunctionTypeNode(typeParameters, parameters, type);
-    if (!isConstructorType)
-      node.modifiers = modifiers;
     return withJSDoc(finishNode(node, pos), hasJSDoc);
   }
   function parseKeywordAndNoDot() {
@@ -42585,6 +42584,7 @@ function createTypeChecker(host) {
   let inlineLevel = 0;
   let currentNode;
   let varianceTypeParameter;
+  let isInferencePartiallyBlocked = false;
   const emptySymbols = createSymbolTable();
   const arrayVariances = [1 /* Covariant */];
   const compilerOptions = host.getCompilerOptions();
@@ -43016,7 +43016,9 @@ function createTypeChecker(host) {
         toMarkSkip = toMarkSkip.parent;
       } while (toMarkSkip && toMarkSkip !== containingCall);
     }
+    isInferencePartiallyBlocked = true;
     const result = runWithoutResolvedSignatureCaching(node, fn);
+    isInferencePartiallyBlocked = false;
     if (containingCall) {
       let toMarkSkip = node;
       do {
@@ -53062,6 +53064,7 @@ function createTypeChecker(host) {
     const typeParameter = getTypeParameterFromMappedType(type);
     const constraintType = getConstraintTypeFromMappedType(type);
     const nameType = getNameTypeFromMappedType(type.target || type);
+    const isFilteringMappedType = nameType && isTypeAssignableTo(nameType, typeParameter);
     const templateType = getTemplateTypeFromMappedType(type.target || type);
     const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
     const templateModifiers = getMappedTypeModifiers(type);
@@ -53099,7 +53102,7 @@ function createTypeChecker(host) {
           prop.links.keyType = keyType;
           if (modifiersProp) {
             prop.links.syntheticOrigin = modifiersProp;
-            prop.declarations = nameType ? void 0 : modifiersProp.declarations;
+            prop.declarations = !nameType || isFilteringMappedType ? modifiersProp.declarations : void 0;
           }
           members.set(propName, prop);
         }
@@ -61831,6 +61834,9 @@ function createTypeChecker(host) {
     const key = `B${getTypeId(type)}`;
     return (_a2 = getCachedType(key)) != null ? _a2 : setCachedType(key, mapType(type, getBaseTypeOfLiteralType));
   }
+  function getBaseTypeOfLiteralTypeForComparison(type) {
+    return type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) ? stringType : type.flags & (256 /* NumberLiteral */ | 32 /* Enum */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 512 /* BooleanLiteral */ ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getBaseTypeOfLiteralTypeForComparison) : type;
+  }
   function getWidenedLiteralType(type) {
     return type.flags & 1056 /* EnumLike */ && isFreshLiteralType(type) ? getBaseTypeOfEnumLikeType(type) : type.flags & 128 /* StringLiteral */ && isFreshLiteralType(type) ? stringType : type.flags & 256 /* NumberLiteral */ && isFreshLiteralType(type) ? numberType : type.flags & 2048 /* BigIntLiteral */ && isFreshLiteralType(type) ? bigintType : type.flags & 512 /* BooleanLiteral */ && isFreshLiteralType(type) ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getWidenedLiteralType) : type;
   }
@@ -69655,7 +69661,7 @@ function createTypeChecker(host) {
     const isTaggedTemplate = node.kind === 212 /* TaggedTemplateExpression */;
     const isDecorator2 = node.kind === 167 /* Decorator */;
     const isJsxOpeningOrSelfClosingElement = isJsxOpeningLikeElement(node);
-    const reportErrors2 = !candidatesOutArray;
+    const reportErrors2 = !isInferencePartiallyBlocked && !candidatesOutArray;
     let typeArguments;
     if (!isDecorator2 && !isSuperCall(node)) {
       typeArguments = node.typeArguments;
@@ -72896,8 +72902,8 @@ function createTypeChecker(host) {
       case 32 /* LessThanEqualsToken */:
       case 33 /* GreaterThanEqualsToken */:
         if (checkForDisallowedESSymbolOperand(operator)) {
-          leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
-          rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
+          leftType = getBaseTypeOfLiteralTypeForComparison(checkNonNullType(leftType, left));
+          rightType = getBaseTypeOfLiteralTypeForComparison(checkNonNullType(rightType, right));
           reportOperatorErrorUnless((left2, right2) => {
             if (isTypeAny(left2) || isTypeAny(right2)) {
               return true;
@@ -74733,6 +74739,17 @@ function createTypeChecker(host) {
             lastSeenNonAmbientDeclaration = node;
           }
         }
+        if (isInJSFile(current) && isFunctionLike(current) && current.jsDoc) {
+          for (const node2 of current.jsDoc) {
+            if (node2.tags) {
+              for (const tag of node2.tags) {
+                if (isJSDocOverloadTag(tag)) {
+                  hasOverloads = true;
+                }
+              }
+            }
+          }
+        }
       }
     }
     if (multipleConstructorImplementation) {
@@ -74770,8 +74787,9 @@ function createTypeChecker(host) {
         const bodySignature = getSignatureFromDeclaration(bodyDeclaration);
         for (const signature of signatures) {
           if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
+            const errorNode = signature.declaration && isJSDocSignature(signature.declaration) ? signature.declaration.parent.tagName : signature.declaration;
             addRelatedInfo(
-              error(signature.declaration, Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature),
+              error(errorNode, Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature),
               createDiagnosticForNode(bodyDeclaration, Diagnostics.The_implementation_signature_is_declared_here)
             );
             break;
@@ -81387,7 +81405,6 @@ function createTypeChecker(host) {
       case 299 /* PropertyAssignment */:
       case 300 /* ShorthandPropertyAssignment */:
       case 267 /* NamespaceExportDeclaration */:
-      case 181 /* FunctionType */:
       case 279 /* MissingDeclaration */:
         return find(node.modifiers, isModifier);
       default:
@@ -87634,7 +87651,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

@@ -1351,6 +1351,7 @@ __export(server_exports, {
   isGetOrSetAccessorDeclaration: () => isGetOrSetAccessorDeclaration,
   isGlobalDeclaration: () => isGlobalDeclaration,
   isGlobalScopeAugmentation: () => isGlobalScopeAugmentation,
+  isGrammarError: () => isGrammarError,
   isHeritageClause: () => isHeritageClause,
   isHoistedFunction: () => isHoistedFunction,
   isHoistedVariableStatement: () => isHoistedVariableStatement,
@@ -2287,7 +2288,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230216`;
+var version = `${versionMajorMinor}.0-dev.20230217`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -15193,6 +15194,36 @@ function nodeIsMissing(node) {
 function nodeIsPresent(node) {
   return !nodeIsMissing(node);
 }
+function isGrammarError(parent2, child) {
+  if (isTypeParameterDeclaration(parent2))
+    return child === parent2.expression;
+  if (isClassStaticBlockDeclaration(parent2))
+    return child === parent2.modifiers;
+  if (isPropertySignature(parent2))
+    return child === parent2.initializer;
+  if (isPropertyDeclaration(parent2))
+    return child === parent2.questionToken && isAutoAccessorPropertyDeclaration(parent2);
+  if (isPropertyAssignment(parent2))
+    return child === parent2.modifiers || child === parent2.questionToken || child === parent2.exclamationToken || isGrammarErrorElement(parent2.modifiers, child, isModifierLike);
+  if (isShorthandPropertyAssignment(parent2))
+    return child === parent2.equalsToken || child === parent2.modifiers || child === parent2.questionToken || child === parent2.exclamationToken || isGrammarErrorElement(parent2.modifiers, child, isModifierLike);
+  if (isMethodDeclaration(parent2))
+    return child === parent2.exclamationToken;
+  if (isConstructorDeclaration(parent2))
+    return child === parent2.typeParameters || child === parent2.type || isGrammarErrorElement(parent2.typeParameters, child, isTypeParameterDeclaration);
+  if (isGetAccessorDeclaration(parent2))
+    return child === parent2.typeParameters || isGrammarErrorElement(parent2.typeParameters, child, isTypeParameterDeclaration);
+  if (isSetAccessorDeclaration(parent2))
+    return child === parent2.typeParameters || child === parent2.type || isGrammarErrorElement(parent2.typeParameters, child, isTypeParameterDeclaration);
+  if (isNamespaceExportDeclaration(parent2))
+    return child === parent2.modifiers || isGrammarErrorElement(parent2.modifiers, child, isModifierLike);
+  return false;
+}
+function isGrammarErrorElement(nodeArray, child, isElement) {
+  if (!nodeArray || isArray(child) || !isElement(child))
+    return false;
+  return contains(nodeArray, child);
+}
 function insertStatementsAfterPrologue(to, from, isPrologueDirective2) {
   if (from === void 0 || from.length === 0)
     return to;
@@ -29280,7 +29311,7 @@ function canHaveIllegalDecorators(node) {
 }
 function canHaveIllegalModifiers(node) {
   const kind = node.kind;
-  return kind === 172 /* ClassStaticBlockDeclaration */ || kind === 299 /* PropertyAssignment */ || kind === 300 /* ShorthandPropertyAssignment */ || kind === 181 /* FunctionType */ || kind === 279 /* MissingDeclaration */ || kind === 267 /* NamespaceExportDeclaration */;
+  return kind === 172 /* ClassStaticBlockDeclaration */ || kind === 299 /* PropertyAssignment */ || kind === 300 /* ShorthandPropertyAssignment */ || kind === 279 /* MissingDeclaration */ || kind === 267 /* NamespaceExportDeclaration */;
 }
 function isQuestionOrExclamationToken(node) {
   return isQuestionToken(node) || isExclamationToken(node);
@@ -32595,6 +32626,7 @@ var Parser;
     const hasJSDoc = hasPrecedingJSDocComment();
     const modifiers = parseModifiersForConstructorType();
     const isConstructorType = parseOptional(103 /* NewKeyword */);
+    Debug.assert(!modifiers || isConstructorType, "Per isStartOfFunctionOrConstructorType, a function type cannot have modifiers.");
     const typeParameters = parseTypeParameters();
     const parameters = parseParameters(4 /* Type */);
     const type = parseReturnType(
@@ -32603,8 +32635,6 @@ var Parser;
       false
     );
     const node = isConstructorType ? factory2.createConstructorTypeNode(modifiers, typeParameters, parameters, type) : factory2.createFunctionTypeNode(typeParameters, parameters, type);
-    if (!isConstructorType)
-      node.modifiers = modifiers;
     return withJSDoc(finishNode(node, pos), hasJSDoc);
   }
   function parseKeywordAndNoDot() {
@@ -47161,6 +47191,7 @@ function createTypeChecker(host) {
   let inlineLevel = 0;
   let currentNode;
   let varianceTypeParameter;
+  let isInferencePartiallyBlocked = false;
   const emptySymbols = createSymbolTable();
   const arrayVariances = [1 /* Covariant */];
   const compilerOptions = host.getCompilerOptions();
@@ -47592,7 +47623,9 @@ function createTypeChecker(host) {
         toMarkSkip = toMarkSkip.parent;
       } while (toMarkSkip && toMarkSkip !== containingCall);
     }
+    isInferencePartiallyBlocked = true;
     const result = runWithoutResolvedSignatureCaching(node, fn);
+    isInferencePartiallyBlocked = false;
     if (containingCall) {
       let toMarkSkip = node;
       do {
@@ -57638,6 +57671,7 @@ function createTypeChecker(host) {
     const typeParameter = getTypeParameterFromMappedType(type);
     const constraintType = getConstraintTypeFromMappedType(type);
     const nameType = getNameTypeFromMappedType(type.target || type);
+    const isFilteringMappedType = nameType && isTypeAssignableTo(nameType, typeParameter);
     const templateType = getTemplateTypeFromMappedType(type.target || type);
     const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
     const templateModifiers = getMappedTypeModifiers(type);
@@ -57675,7 +57709,7 @@ function createTypeChecker(host) {
           prop.links.keyType = keyType;
           if (modifiersProp) {
             prop.links.syntheticOrigin = modifiersProp;
-            prop.declarations = nameType ? void 0 : modifiersProp.declarations;
+            prop.declarations = !nameType || isFilteringMappedType ? modifiersProp.declarations : void 0;
           }
           members.set(propName, prop);
         }
@@ -66407,6 +66441,9 @@ function createTypeChecker(host) {
     const key = `B${getTypeId(type)}`;
     return (_a2 = getCachedType(key)) != null ? _a2 : setCachedType(key, mapType(type, getBaseTypeOfLiteralType));
   }
+  function getBaseTypeOfLiteralTypeForComparison(type) {
+    return type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) ? stringType : type.flags & (256 /* NumberLiteral */ | 32 /* Enum */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 512 /* BooleanLiteral */ ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getBaseTypeOfLiteralTypeForComparison) : type;
+  }
   function getWidenedLiteralType(type) {
     return type.flags & 1056 /* EnumLike */ && isFreshLiteralType(type) ? getBaseTypeOfEnumLikeType(type) : type.flags & 128 /* StringLiteral */ && isFreshLiteralType(type) ? stringType : type.flags & 256 /* NumberLiteral */ && isFreshLiteralType(type) ? numberType : type.flags & 2048 /* BigIntLiteral */ && isFreshLiteralType(type) ? bigintType : type.flags & 512 /* BooleanLiteral */ && isFreshLiteralType(type) ? booleanType : type.flags & 1048576 /* Union */ ? mapType(type, getWidenedLiteralType) : type;
   }
@@ -74231,7 +74268,7 @@ function createTypeChecker(host) {
     const isTaggedTemplate = node.kind === 212 /* TaggedTemplateExpression */;
     const isDecorator2 = node.kind === 167 /* Decorator */;
     const isJsxOpeningOrSelfClosingElement = isJsxOpeningLikeElement(node);
-    const reportErrors2 = !candidatesOutArray;
+    const reportErrors2 = !isInferencePartiallyBlocked && !candidatesOutArray;
     let typeArguments;
     if (!isDecorator2 && !isSuperCall(node)) {
       typeArguments = node.typeArguments;
@@ -77472,8 +77509,8 @@ function createTypeChecker(host) {
       case 32 /* LessThanEqualsToken */:
       case 33 /* GreaterThanEqualsToken */:
         if (checkForDisallowedESSymbolOperand(operator)) {
-          leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
-          rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
+          leftType = getBaseTypeOfLiteralTypeForComparison(checkNonNullType(leftType, left));
+          rightType = getBaseTypeOfLiteralTypeForComparison(checkNonNullType(rightType, right));
           reportOperatorErrorUnless((left2, right2) => {
             if (isTypeAny(left2) || isTypeAny(right2)) {
               return true;
@@ -79309,6 +79346,17 @@ function createTypeChecker(host) {
             lastSeenNonAmbientDeclaration = node;
           }
         }
+        if (isInJSFile(current) && isFunctionLike(current) && current.jsDoc) {
+          for (const node2 of current.jsDoc) {
+            if (node2.tags) {
+              for (const tag of node2.tags) {
+                if (isJSDocOverloadTag(tag)) {
+                  hasOverloads = true;
+                }
+              }
+            }
+          }
+        }
       }
     }
     if (multipleConstructorImplementation) {
@@ -79346,8 +79394,9 @@ function createTypeChecker(host) {
         const bodySignature = getSignatureFromDeclaration(bodyDeclaration);
         for (const signature of signatures) {
           if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
+            const errorNode = signature.declaration && isJSDocSignature(signature.declaration) ? signature.declaration.parent.tagName : signature.declaration;
             addRelatedInfo(
-              error(signature.declaration, Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature),
+              error(errorNode, Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature),
               createDiagnosticForNode(bodyDeclaration, Diagnostics.The_implementation_signature_is_declared_here)
             );
             break;
@@ -85963,7 +86012,6 @@ function createTypeChecker(host) {
       case 299 /* PropertyAssignment */:
       case 300 /* ShorthandPropertyAssignment */:
       case 267 /* NamespaceExportDeclaration */:
-      case 181 /* FunctionType */:
       case 279 /* MissingDeclaration */:
         return find(node.modifiers, isModifier);
       default:
@@ -92381,7 +92429,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)) {
@@ -135428,7 +135485,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) {
@@ -147236,7 +147294,14 @@ function updatePropertyDeclaration(changeTracker, file, declaration, type, field
   changeTracker.replaceNode(file, declaration, property);
 }
 function updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName) {
-  const assignment = factory.updatePropertyAssignment(declaration, fieldName, declaration.initializer);
+  let assignment = factory.updatePropertyAssignment(declaration, fieldName, declaration.initializer);
+  if (assignment.modifiers || assignment.questionToken || assignment.exclamationToken) {
+    if (assignment === declaration)
+      assignment = factory.cloneNode(assignment);
+    assignment.modifiers = void 0;
+    assignment.questionToken = void 0;
+    assignment.exclamationToken = void 0;
+  }
   changeTracker.replacePropertyAssignment(file, declaration, assignment);
 }
 function updateFieldDeclaration(changeTracker, file, declaration, type, fieldName, modifiers) {
@@ -148256,7 +148321,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)) {
@@ -148278,7 +148343,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;
   }
@@ -148303,7 +148368,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);
       }
@@ -148433,7 +148498,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,
@@ -148507,7 +148572,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))) {
@@ -148756,7 +148822,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;
@@ -148800,7 +148866,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)];
@@ -148868,7 +148936,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) {
@@ -149338,7 +149407,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);
@@ -149378,7 +149447,8 @@ function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, con
       kind,
       formatContext,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (!entry) {
       continue;
@@ -151577,7 +151647,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);
@@ -151586,10 +151656,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;
   }
@@ -151615,7 +151685,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 };
     }
@@ -166366,7 +166457,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
     }
     function processChildNode(child, inheritedIndentation, parent2, parentDynamicIndentation, parentStartLine, undecoratedParentStartLine, isListItem, isFirstListItem) {
       Debug.assert(!nodeIsSynthesized(child));
-      if (nodeIsMissing(child)) {
+      if (nodeIsMissing(child) || isGrammarError(parent2, child)) {
         return inheritedIndentation;
       }
       const childStartPos = child.getStart(sourceFile);
@@ -168779,6 +168870,7 @@ __export(ts_exports3, {
   isGetOrSetAccessorDeclaration: () => isGetOrSetAccessorDeclaration,
   isGlobalDeclaration: () => isGlobalDeclaration,
   isGlobalScopeAugmentation: () => isGlobalScopeAugmentation,
+  isGrammarError: () => isGrammarError,
   isHeritageClause: () => isHeritageClause,
   isHoistedFunction: () => isHoistedFunction,
   isHoistedVariableStatement: () => isHoistedVariableStatement,
@@ -182728,6 +182820,7 @@ start(initializeNodeSystem(), require("os").platform());
   isGetOrSetAccessorDeclaration,
   isGlobalDeclaration,
   isGlobalScopeAugmentation,
+  isGrammarError,
   isHeritageClause,
   isHoistedFunction,
   isHoistedVariableStatement,

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