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

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = `${versionMajorMinor}.0-dev.20230216`;
+      version = `${versionMajorMinor}.0-dev.20230218`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9616,18 +9616,18 @@ ${lanes.join("\n")}
     return true;
   }
   function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Standard */, textInitial, onError, start, 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, start, length2);
-    const scanner2 = {
+    var scanner2 = {
       getStartPos: () => startPos,
       getTextPos: () => pos,
       getToken: () => token,
@@ -13027,6 +13027,36 @@ ${lanes.join("\n")}
   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;
@@ -27168,7 +27198,7 @@ ${lanes.join("\n")}
   }
   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);
@@ -28434,22 +28464,22 @@ ${lanes.join("\n")}
         [356 /* PartiallyEmittedExpression */]: forEachChildInPartiallyEmittedExpression
       };
       ((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*/
@@ -28486,25 +28516,25 @@ ${lanes.join("\n")}
             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);
@@ -30706,6 +30736,7 @@ ${lanes.join("\n")}
           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(
@@ -30714,8 +30745,6 @@ ${lanes.join("\n")}
             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() {
@@ -32012,13 +32041,9 @@ ${lanes.join("\n")}
         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
           )) {
@@ -44970,6 +44995,7 @@ ${lanes.join("\n")}
     let inlineLevel = 0;
     let currentNode;
     let varianceTypeParameter;
+    let isInferencePartiallyBlocked = false;
     const emptySymbols = createSymbolTable();
     const arrayVariances = [1 /* Covariant */];
     const compilerOptions = host.getCompilerOptions();
@@ -45401,7 +45427,9 @@ ${lanes.join("\n")}
           toMarkSkip = toMarkSkip.parent;
         } while (toMarkSkip && toMarkSkip !== containingCall);
       }
+      isInferencePartiallyBlocked = true;
       const result = runWithoutResolvedSignatureCaching(node, fn);
+      isInferencePartiallyBlocked = false;
       if (containingCall) {
         let toMarkSkip = node;
         do {
@@ -49675,7 +49703,7 @@ ${lanes.join("\n")}
           return result;
         }
         function createAnonymousTypeNode(type2) {
-          var _a3;
+          var _a3, _b2;
           const typeId = type2.id;
           const symbol = type2.symbol;
           if (symbol) {
@@ -49701,6 +49729,20 @@ ${lanes.join("\n")}
               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() {
@@ -50209,7 +50251,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 +50268,39 @@ ${lanes.join("\n")}
           /*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) {
@@ -50251,11 +50326,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 +50345,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 +50387,7 @@ ${lanes.join("\n")}
         if (typeArguments) {
           node.typeArguments = factory.createNodeArray(typeArguments);
         }
+        cleanup == null ? void 0 : cleanup();
         return node;
       }
       function tryGetThisParameterDeclaration(signature, context) {
@@ -50926,9 +51002,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 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)) {
@@ -50960,7 +51039,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)) {
@@ -55447,6 +55527,7 @@ ${lanes.join("\n")}
       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);
@@ -55484,7 +55565,7 @@ ${lanes.join("\n")}
             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);
           }
@@ -64216,6 +64297,9 @@ ${lanes.join("\n")}
       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;
     }
@@ -72040,7 +72124,7 @@ ${lanes.join("\n")}
       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;
@@ -75281,8 +75365,8 @@ ${lanes.join("\n")}
         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;
@@ -77118,6 +77202,17 @@ ${lanes.join("\n")}
               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) {
@@ -77155,8 +77250,9 @@ ${lanes.join("\n")}
           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;
@@ -80189,20 +80285,19 @@ ${lanes.join("\n")}
         }
       }
     }
-    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,
@@ -80215,7 +80310,7 @@ ${lanes.join("\n")}
         isStatic(member),
         /* memberIsParameterProperty */
         false,
-        memberName
+        symbolName(memberSymbol)
       );
     }
     function getTargetSymbol(s) {
@@ -83772,7 +83867,6 @@ ${lanes.join("\n")}
         case 299 /* PropertyAssignment */:
         case 300 /* ShorthandPropertyAssignment */:
         case 267 /* NamespaceExportDeclaration */:
-        case 181 /* FunctionType */:
         case 279 /* MissingDeclaration */:
           return find(node.modifiers, isModifier);
         default:
@@ -90366,7 +90460,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)) {
@@ -133196,7 +133299,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) {
@@ -146120,7 +146224,14 @@ ${lanes.join("\n")}
     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) {
@@ -147249,7 +147360,7 @@ ${lanes.join("\n")}
     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;
@@ -147269,6 +147380,9 @@ ${lanes.join("\n")}
   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 start = timestamp();
@@ -147311,7 +147425,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)) {
@@ -147333,7 +147447,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;
     }
@@ -147358,7 +147472,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);
         }
@@ -147488,7 +147602,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,
@@ -147562,7 +147676,8 @@ ${lanes.join("\n")}
       symbolToOriginInfoMap,
       symbolToSortTextMap,
       isJsxIdentifierExpected,
-      isRightOfOpenTag
+      isRightOfOpenTag,
+      includeSymbol
     );
     if (keywordFilters !== 0 /* None */) {
       for (const keywordEntry of getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && isSourceFileJS(sourceFile))) {
@@ -147811,7 +147926,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;
@@ -147855,7 +147970,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)];
@@ -147923,7 +148040,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) {
@@ -147991,7 +148109,7 @@ ${lanes.join("\n")}
         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) {
@@ -148393,7 +148511,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);
@@ -148433,7 +148551,8 @@ ${lanes.join("\n")}
         kind,
         formatContext,
         isJsxIdentifierExpected,
-        isRightOfOpenTag
+        isRightOfOpenTag,
+        includeSymbol
       );
       if (!entry) {
         continue;
@@ -148584,7 +148703,8 @@ ${lanes.join("\n")}
       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;
@@ -148635,12 +148755,12 @@ ${lanes.join("\n")}
   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 };
@@ -149738,6 +149858,16 @@ ${lanes.join("\n")}
           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 */;
     }
@@ -150122,7 +150252,7 @@ ${lanes.join("\n")}
     }
     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 */:
@@ -150630,6 +150760,7 @@ ${lanes.join("\n")}
         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;
@@ -150674,7 +150805,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);
@@ -150683,10 +150814,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;
     }
@@ -150712,7 +150843,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 };
       }
@@ -150744,7 +150896,7 @@ ${lanes.join("\n")}
       }
       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;
@@ -165857,7 +166009,7 @@ ${options.prefix}` : "\n" : options.prefix
       }
       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);
@@ -179366,6 +179518,7 @@ ${e.message}`;
     isGetOrSetAccessorDeclaration: () => isGetOrSetAccessorDeclaration,
     isGlobalDeclaration: () => isGlobalDeclaration,
     isGlobalScopeAugmentation: () => isGlobalScopeAugmentation,
+    isGrammarError: () => isGrammarError,
     isHeritageClause: () => isHeritageClause,
     isHoistedFunction: () => isHoistedFunction,
     isHoistedVariableStatement: () => isHoistedVariableStatement,
@@ -181725,6 +181878,7 @@ ${e.message}`;
     isGetOrSetAccessorDeclaration: () => isGetOrSetAccessorDeclaration,
     isGlobalDeclaration: () => isGlobalDeclaration,
     isGlobalScopeAugmentation: () => isGlobalScopeAugmentation,
+    isGrammarError: () => isGrammarError,
     isHeritageClause: () => isHeritageClause,
     isHoistedFunction: () => isHoistedFunction,
     isHoistedVariableStatement: () => isHoistedVariableStatement,