typescript 5.0.0-dev.20230216 → 5.0.0-dev.20230218

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.20230218`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -11951,18 +11952,18 @@ function isIdentifierText(name, languageVersion, identifierVariant) {
   return true;
 }
 function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Standard */, textInitial, onError, start2, length2) {
-  let text = textInitial;
-  let pos;
-  let end;
-  let startPos;
-  let tokenPos;
-  let token;
-  let tokenValue;
-  let tokenFlags;
-  let commentDirectives;
-  let inJSDocType = 0;
+  var text = textInitial;
+  var pos;
+  var end;
+  var startPos;
+  var tokenPos;
+  var token;
+  var tokenValue;
+  var tokenFlags;
+  var commentDirectives;
+  var inJSDocType = 0;
   setText(text, start2, length2);
-  const scanner2 = {
+  var scanner2 = {
     getStartPos: () => startPos,
     getTextPos: () => pos,
     getToken: () => token,
@@ -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);
@@ -30323,22 +30354,22 @@ function parseJSDocTypeExpressionForTests(content, start2, length2) {
 }
 var Parser;
 ((Parser2) => {
-  const scanner2 = createScanner(
+  var scanner2 = createScanner(
     99 /* Latest */,
     /*skipTrivia*/
     true
   );
-  const disallowInAndDecoratorContext = 4096 /* DisallowInContext */ | 16384 /* DecoratorContext */;
-  let NodeConstructor2;
-  let TokenConstructor2;
-  let IdentifierConstructor2;
-  let PrivateIdentifierConstructor2;
-  let SourceFileConstructor2;
+  var disallowInAndDecoratorContext = 4096 /* DisallowInContext */ | 16384 /* DecoratorContext */;
+  var NodeConstructor2;
+  var TokenConstructor2;
+  var IdentifierConstructor2;
+  var PrivateIdentifierConstructor2;
+  var SourceFileConstructor2;
   function countNode(node) {
     nodeCount++;
     return node;
   }
-  const baseNodeFactory = {
+  var baseNodeFactory = {
     createBaseSourceFileNode: (kind) => countNode(new SourceFileConstructor2(
       kind,
       /*pos*/
@@ -30375,25 +30406,25 @@ var Parser;
       0
     ))
   };
-  const factory2 = createNodeFactory(1 /* NoParenthesizerRules */ | 2 /* NoNodeConverters */ | 8 /* NoOriginalNode */, baseNodeFactory);
-  let fileName;
-  let sourceFlags;
-  let sourceText;
-  let languageVersion;
-  let scriptKind;
-  let languageVariant;
-  let parseDiagnostics;
-  let jsDocDiagnostics;
-  let syntaxCursor;
-  let currentToken;
-  let nodeCount;
-  let identifiers;
-  let identifierCount;
-  let parsingContext;
-  let notParenthesizedArrow;
-  let contextFlags;
-  let topLevel = true;
-  let parseErrorBeforeNextFinishedNode = false;
+  var factory2 = createNodeFactory(1 /* NoParenthesizerRules */ | 2 /* NoNodeConverters */ | 8 /* NoOriginalNode */, baseNodeFactory);
+  var fileName;
+  var sourceFlags;
+  var sourceText;
+  var languageVersion;
+  var scriptKind;
+  var languageVariant;
+  var parseDiagnostics;
+  var jsDocDiagnostics;
+  var syntaxCursor;
+  var currentToken;
+  var nodeCount;
+  var identifiers;
+  var identifierCount;
+  var parsingContext;
+  var notParenthesizedArrow;
+  var contextFlags;
+  var topLevel = true;
+  var parseErrorBeforeNextFinishedNode = false;
   function parseSourceFile(fileName2, sourceText2, languageVersion2, syntaxCursor2, setParentNodes = false, scriptKind2, setExternalModuleIndicatorOverride) {
     var _a2;
     scriptKind2 = ensureScriptKind(fileName2, scriptKind2);
@@ -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() {
@@ -33901,13 +33931,9 @@ var Parser;
   function parseJsxClosingFragment(inExpressionContext) {
     const pos = getNodePos();
     parseExpected(30 /* LessThanSlashToken */);
-    if (tokenIsIdentifierOrKeyword(token())) {
-      parseErrorAtRange(parseJsxElementName(), Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
-    }
     if (parseExpected(
       31 /* GreaterThanToken */,
-      /*diagnostic*/
-      void 0,
+      Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment,
       /*shouldAdvance*/
       false
     )) {
@@ -47161,6 +47187,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 +47619,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 {
@@ -51866,7 +51895,7 @@ function createTypeChecker(host) {
         return result;
       }
       function createAnonymousTypeNode(type2) {
-        var _a3;
+        var _a3, _b2;
         const typeId = type2.id;
         const symbol = type2.symbol;
         if (symbol) {
@@ -51892,6 +51921,20 @@ function createTypeChecker(host) {
             return visitAndTransformType(type2, createTypeNodeFromObjectType);
           }
         } else {
+          const isInstantiationExpressionType = !!(getObjectFlags(type2) & 8388608 /* InstantiationExpressionType */);
+          if (isInstantiationExpressionType) {
+            const instantiationExpressionType = type2;
+            if (isTypeQueryNode(instantiationExpressionType.node)) {
+              const typeNode = serializeExistingTypeNode(context, instantiationExpressionType.node);
+              if (typeNode) {
+                return typeNode;
+              }
+            }
+            if ((_b2 = context.visitedTypes) == null ? void 0 : _b2.has(typeId)) {
+              return createElidedInformationPlaceholder(context);
+            }
+            return visitAndTransformType(type2, createTypeNodeFromObjectType);
+          }
           return createTypeNodeFromObjectType(type2);
         }
         function shouldWriteTypeOfFunctionSymbol() {
@@ -52400,7 +52443,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 +52460,39 @@ function createTypeChecker(host) {
         /*skipUnionExpanding*/
         true
       )[0];
+      let cleanup;
+      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
+        const existingFakeScope = getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration ? context.enclosingDeclaration : void 0;
+        Debug.assertOptionalNode(existingFakeScope, isBlock);
+        const locals = (_a2 = existingFakeScope == null ? void 0 : existingFakeScope.locals) != null ? _a2 : 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) {
+          let removeNewLocals2 = function() {
+            forEach(newLocals, (s) => locals.delete(s));
+          };
+          var removeNewLocals = removeNewLocals2;
+          if (existingFakeScope) {
+            cleanup = removeNewLocals2;
+          } else {
+            const fakeScope = parseNodeFactory.createBlock(emptyArray);
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+            fakeScope.locals = locals;
+            const saveEnclosingDeclaration = context.enclosingDeclaration;
+            setParent(fakeScope, saveEnclosingDeclaration);
+            context.enclosingDeclaration = fakeScope;
+            cleanup = () => {
+              context.enclosingDeclaration = saveEnclosingDeclaration;
+              removeNewLocals2();
+            };
+          }
+        }
+      }
       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 +52518,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 +52537,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 +52579,7 @@ function createTypeChecker(host) {
       if (typeArguments) {
         node.typeArguments = factory.createNodeArray(typeArguments);
       }
+      cleanup == null ? void 0 : cleanup();
       return node;
     }
     function tryGetThisParameterDeclaration(signature, context) {
@@ -53117,9 +53194,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 getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration ? enclosingDeclaration.parent : enclosingDeclaration;
+    }
     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 +53231,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)) {
@@ -57638,6 +57719,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 +57757,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 +66489,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 +74316,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 +77557,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 +79394,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 +79442,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;
@@ -82380,20 +82477,19 @@ function createTypeChecker(host) {
       }
     }
   }
-  function getMemberOverrideModifierStatus(node, member) {
+  function getMemberOverrideModifierStatus(node, member, memberSymbol) {
     if (!member.name) {
       return 0 /* Ok */;
     }
-    const symbol = getSymbolOfDeclaration(node);
-    const type = getDeclaredTypeOfSymbol(symbol);
+    const classSymbol = getSymbolOfDeclaration(node);
+    const type = getDeclaredTypeOfSymbol(classSymbol);
     const typeWithThis = getTypeWithThisArgument(type);
-    const staticType = getTypeOfSymbol(symbol);
+    const staticType = getTypeOfSymbol(classSymbol);
     const baseTypeNode = getEffectiveBaseTypeNode(node);
     const baseTypes = baseTypeNode && getBaseTypes(type);
     const baseWithThis = (baseTypes == null ? void 0 : baseTypes.length) ? getTypeWithThisArgument(first(baseTypes), type.thisType) : void 0;
     const baseStaticType = getBaseConstructorTypeOfClass(type);
     const memberHasOverrideModifier = member.parent ? hasOverrideModifier(member) : hasSyntacticModifier(member, 16384 /* Override */);
-    const memberName = unescapeLeadingUnderscores(getTextOfPropertyName(member.name));
     return checkMemberForOverrideModifier(
       node,
       staticType,
@@ -82406,7 +82502,7 @@ function createTypeChecker(host) {
       isStatic(member),
       /* memberIsParameterProperty */
       false,
-      memberName
+      symbolName(memberSymbol)
     );
   }
   function getTargetSymbol(s) {
@@ -85963,7 +86059,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 +92476,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 +135532,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 +147341,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) {
@@ -148177,6 +148289,7 @@ var SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {
   SymbolOriginInfoKind2[SymbolOriginInfoKind2["TypeOnlyAlias"] = 64] = "TypeOnlyAlias";
   SymbolOriginInfoKind2[SymbolOriginInfoKind2["ObjectLiteralMethod"] = 128] = "ObjectLiteralMethod";
   SymbolOriginInfoKind2[SymbolOriginInfoKind2["Ignore"] = 256] = "Ignore";
+  SymbolOriginInfoKind2[SymbolOriginInfoKind2["ComputedPropertyName"] = 512] = "ComputedPropertyName";
   SymbolOriginInfoKind2[SymbolOriginInfoKind2["SymbolMemberNoExport"] = 2 /* SymbolMember */] = "SymbolMemberNoExport";
   SymbolOriginInfoKind2[SymbolOriginInfoKind2["SymbolMemberExport"] = 6] = "SymbolMemberExport";
   return SymbolOriginInfoKind2;
@@ -148194,7 +148307,7 @@ function originIsResolvedExport(origin) {
   return !!(origin && origin.kind === 32 /* ResolvedExport */);
 }
 function originIncludesSymbolName(origin) {
-  return originIsExport(origin) || originIsResolvedExport(origin);
+  return originIsExport(origin) || originIsResolvedExport(origin) || originIsComputedPropertyName(origin);
 }
 function originIsPackageJsonImport(origin) {
   return (originIsExport(origin) || originIsResolvedExport(origin)) && !!origin.isFromPackageJson;
@@ -148214,6 +148327,9 @@ function originIsObjectLiteralMethod(origin) {
 function originIsIgnore(origin) {
   return !!(origin && origin.kind & 256 /* Ignore */);
 }
+function originIsComputedPropertyName(origin) {
+  return !!(origin && origin.kind & 512 /* ComputedPropertyName */);
+}
 function resolvingModuleSpecifiers(logPrefix, host, resolver, program, position, preferences, isForImportStatementCompletion, isValidTypeOnlyUseSite, cb) {
   var _a2, _b, _c;
   const start2 = timestamp();
@@ -148256,7 +148372,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 +148394,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 +148419,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 +148549,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 +148623,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 +148873,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 +148917,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 +148987,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) {
@@ -148936,7 +149056,7 @@ function getEntryForMemberCompletion(host, program, options, preferences, name,
       if (isAbstract) {
         requiredModifiers |= 256 /* Abstract */;
       }
-      if (isClassElement(node) && checker.getMemberOverrideModifierStatus(classLikeDeclaration, node) === 1 /* NeedsOverride */) {
+      if (isClassElement(node) && checker.getMemberOverrideModifierStatus(classLikeDeclaration, node, symbol) === 1 /* NeedsOverride */) {
         requiredModifiers |= 16384 /* Override */;
       }
       if (!completionNodes.length) {
@@ -149338,7 +149458,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 +149498,8 @@ function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, con
       kind,
       formatContext,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (!entry) {
       continue;
@@ -149529,7 +149650,8 @@ function getCompletionEntryDetails(program, log, sourceFile, position, entryId,
     case "symbol": {
       const { symbol, location, contextToken: contextToken2, origin, previousToken: previousToken2 } = symbolCompletion;
       const { codeActions, sourceDisplay } = getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken2, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken2, formatContext, preferences, data, source, cancellationToken);
-      return createCompletionDetailsForSymbol(symbol, typeChecker, sourceFile, location, cancellationToken, codeActions, sourceDisplay);
+      const symbolName2 = originIsComputedPropertyName(origin) ? origin.symbolName : symbol.name;
+      return createCompletionDetailsForSymbol(symbol, symbolName2, typeChecker, sourceFile, location, cancellationToken, codeActions, sourceDisplay);
     }
     case "literal": {
       const { literal } = symbolCompletion;
@@ -149580,12 +149702,12 @@ function getCompletionEntryDetails(program, log, sourceFile, position, entryId,
 function createSimpleDetails(name, kind, kind2) {
   return createCompletionDetails(name, "" /* none */, kind, [displayPart(name, kind2)]);
 }
-function createCompletionDetailsForSymbol(symbol, checker, sourceFile, location, cancellationToken, codeActions, sourceDisplay) {
+function createCompletionDetailsForSymbol(symbol, name, checker, sourceFile, location, cancellationToken, codeActions, sourceDisplay) {
   const { displayParts, documentation, symbolKind, tags } = checker.runWithCancellationToken(
     cancellationToken,
     (checker2) => ts_SymbolDisplay_exports.getSymbolDisplayPartsDocumentationAndSymbolKind(checker2, symbol, sourceFile, location, location, 7 /* All */)
   );
-  return createCompletionDetails(symbol.name, ts_SymbolDisplay_exports.getSymbolModifiers(checker, symbol), symbolKind, displayParts, documentation, tags, codeActions, sourceDisplay);
+  return createCompletionDetails(name, ts_SymbolDisplay_exports.getSymbolModifiers(checker, symbol), symbolKind, displayParts, documentation, tags, codeActions, sourceDisplay);
 }
 function createCompletionDetails(name, kindModifiers, kind, displayParts, documentation, tags, codeActions, source) {
   return { name, kindModifiers, kind, displayParts, documentation, tags, codeActions, source, sourceDisplay: source };
@@ -150692,6 +150814,16 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
         return classElementModifierFlags & 32 /* Static */ ? (type == null ? void 0 : type.symbol) && typeChecker.getPropertiesOfType(typeChecker.getTypeOfSymbolAtLocation(type.symbol, decl)) : type && typeChecker.getPropertiesOfType(type);
       });
       symbols = concatenate(symbols, filterClassMembersList(baseSymbols, decl.members, classElementModifierFlags));
+      forEach(symbols, (symbol, index) => {
+        const declaration = symbol == null ? void 0 : symbol.valueDeclaration;
+        if (declaration && isClassElement(declaration) && declaration.name && isComputedPropertyName(declaration.name)) {
+          const origin = {
+            kind: 512 /* ComputedPropertyName */,
+            symbolName: typeChecker.symbolToString(symbol)
+          };
+          symbolToOriginInfoMap[index] = origin;
+        }
+      });
     }
     return 1 /* Success */;
   }
@@ -151076,7 +151208,7 @@ function getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind, js
   }
   switch (kind) {
     case 3 /* MemberLike */:
-      return void 0;
+      return originIsComputedPropertyName(origin) ? { name: origin.symbolName, needsConvertPropertyAccess: false } : void 0;
     case 0 /* ObjectPropertyDeclaration */:
       return { name: JSON.stringify(name), needsConvertPropertyAccess: false };
     case 2 /* PropertyAccess */:
@@ -151577,7 +151709,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 +151718,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 +151747,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 };
     }
@@ -151647,7 +151800,7 @@ function stringLiteralCompletionDetails(name, location, completion, sourceFile,
     }
     case 1 /* Properties */: {
       const match = find(completion.symbols, (s) => s.name === name);
-      return match && createCompletionDetailsForSymbol(match, checker, sourceFile, location, cancellationToken);
+      return match && createCompletionDetailsForSymbol(match, match.name, checker, sourceFile, location, cancellationToken);
     }
     case 2 /* Types */:
       return find(completion.types, (t) => t.value === name) ? createCompletionDetails(name, "" /* none */, "string" /* string */, [textPart(name)]) : void 0;
@@ -166366,7 +166519,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 +168932,7 @@ __export(ts_exports3, {
   isGetOrSetAccessorDeclaration: () => isGetOrSetAccessorDeclaration,
   isGlobalDeclaration: () => isGlobalDeclaration,
   isGlobalScopeAugmentation: () => isGlobalScopeAugmentation,
+  isGrammarError: () => isGrammarError,
   isHeritageClause: () => isHeritageClause,
   isHoistedFunction: () => isHoistedFunction,
   isHoistedVariableStatement: () => isHoistedVariableStatement,
@@ -182728,6 +182882,7 @@ start(initializeNodeSystem(), require("os").platform());
   isGetOrSetAccessorDeclaration,
   isGlobalDeclaration,
   isGlobalScopeAugmentation,
+  isGrammarError,
   isHeritageClause,
   isHoistedFunction,
   isHoistedVariableStatement,