typescript 5.0.0-dev.20230217 → 5.0.0-dev.20230218

package/lib/tsserver.js

@@ -2288,7 +2288,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230217`;
+var version = `${versionMajorMinor}.0-dev.20230218`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -11952,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,
@@ -30354,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*/
@@ -30406,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);
@@ -33931,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
     )) {
@@ -51899,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) {
@@ -51925,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() {
@@ -52433,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 */;
@@ -52450,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) {
@@ -52475,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,
@@ -52494,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
@@ -52536,6 +52579,7 @@ function createTypeChecker(host) {
       if (typeArguments) {
         node.typeArguments = factory.createNodeArray(typeArguments);
       }
+      cleanup == null ? void 0 : cleanup();
       return node;
     }
     function tryGetThisParameterDeclaration(signature, context) {
@@ -53150,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)) {
@@ -53184,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)) {
@@ -82429,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,
@@ -82455,7 +82502,7 @@ function createTypeChecker(host) {
       isStatic(member),
       /* memberIsParameterProperty */
       false,
-      memberName
+      symbolName(memberSymbol)
     );
   }
   function getTargetSymbol(s) {
@@ -148242,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;
@@ -148259,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;
@@ -148279,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();
@@ -149005,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) {
@@ -149599,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;
@@ -149650,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 };
@@ -150762,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 */;
   }
@@ -151146,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 */:
@@ -151738,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;