typescript 5.2.0-dev.20230625 → 5.2.0-dev.20230627

package/lib/tsserver.js

@@ -2327,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230625`;
+var version = `${versionMajorMinor}.0-dev.20230627`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9733,7 +9733,6 @@ var Diagnostics = {
   This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0: diag(2343, 1 /* Error */, "This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_ve_2343", "This syntax requires an imported helper named '{1}' which does not exist in '{0}'. Consider upgrading your version of '{0}'."),
   Type_0_does_not_satisfy_the_constraint_1: diag(2344, 1 /* Error */, "Type_0_does_not_satisfy_the_constraint_1_2344", "Type '{0}' does not satisfy the constraint '{1}'."),
   Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: diag(2345, 1 /* Error */, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_2345", "Argument of type '{0}' is not assignable to parameter of type '{1}'."),
-  Call_target_does_not_contain_any_signatures: diag(2346, 1 /* Error */, "Call_target_does_not_contain_any_signatures_2346", "Call target does not contain any signatures."),
   Untyped_function_calls_may_not_accept_type_arguments: diag(2347, 1 /* Error */, "Untyped_function_calls_may_not_accept_type_arguments_2347", "Untyped function calls may not accept type arguments."),
   Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: diag(2348, 1 /* Error */, "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", "Value of type '{0}' is not callable. Did you mean to include 'new'?"),
   This_expression_is_not_callable: diag(2349, 1 /* Error */, "This_expression_is_not_callable_2349", "This expression is not callable."),
@@ -10343,7 +10342,6 @@ var Diagnostics = {
   Cannot_find_a_tsconfig_json_file_at_the_current_directory_Colon_0: diag(5081, 1 /* Error */, "Cannot_find_a_tsconfig_json_file_at_the_current_directory_Colon_0_5081", "Cannot find a tsconfig.json file at the current directory: {0}."),
   _0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1: diag(5082, 1 /* Error */, "_0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1_5082", "'{0}' could be instantiated with an arbitrary type which could be unrelated to '{1}'."),
   Cannot_read_file_0: diag(5083, 1 /* Error */, "Cannot_read_file_0_5083", "Cannot read file '{0}'."),
-  Tuple_members_must_all_have_names_or_all_not_have_names: diag(5084, 1 /* Error */, "Tuple_members_must_all_have_names_or_all_not_have_names_5084", "Tuple members must all have names or all not have names."),
   A_tuple_member_cannot_be_both_optional_and_rest: diag(5085, 1 /* Error */, "A_tuple_member_cannot_be_both_optional_and_rest_5085", "A tuple member cannot be both optional and rest."),
   A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_colon_rather_than_after_the_type: diag(5086, 1 /* Error */, "A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_c_5086", "A labeled tuple element is declared as optional with a question mark after the name and before the colon, rather than after the type."),
   A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type: diag(5087, 1 /* Error */, "A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type_5087", "A labeled tuple element is declared as rest with a '...' before the name, rather than before the type."),
@@ -11269,6 +11267,7 @@ var Diagnostics = {
   Inline_variable: diag(95184, 3 /* Message */, "Inline_variable_95184", "Inline variable"),
   Could_not_find_variable_to_inline: diag(95185, 3 /* Message */, "Could_not_find_variable_to_inline_95185", "Could not find variable to inline."),
   Variables_with_multiple_declarations_cannot_be_inlined: diag(95186, 3 /* Message */, "Variables_with_multiple_declarations_cannot_be_inlined_95186", "Variables with multiple declarations cannot be inlined."),
+  Add_missing_comma_for_object_member_completion_0: diag(95187, 3 /* Message */, "Add_missing_comma_for_object_member_completion_0_95187", "Add missing comma for object member completion '{0}'."),
   No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
   Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
   JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -52640,19 +52639,18 @@ function createTypeChecker(host) {
             const arity = getTypeReferenceArity(type2);
             const tupleConstituentNodes = mapToTypeNodes(typeArguments.slice(0, arity), context);
             if (tupleConstituentNodes) {
-              if (type2.target.labeledElementDeclarations) {
-                for (let i = 0; i < tupleConstituentNodes.length; i++) {
-                  const flags = type2.target.elementFlags[i];
+              const { labeledElementDeclarations } = type2.target;
+              for (let i = 0; i < tupleConstituentNodes.length; i++) {
+                const flags = type2.target.elementFlags[i];
+                const labeledElementDeclaration = labeledElementDeclarations == null ? void 0 : labeledElementDeclarations[i];
+                if (labeledElementDeclaration) {
                   tupleConstituentNodes[i] = factory.createNamedTupleMember(
                     flags & 12 /* Variable */ ? factory.createToken(26 /* DotDotDotToken */) : void 0,
-                    factory.createIdentifier(unescapeLeadingUnderscores(getTupleElementLabel(type2.target.labeledElementDeclarations[i]))),
+                    factory.createIdentifier(unescapeLeadingUnderscores(getTupleElementLabel(labeledElementDeclaration))),
                     flags & 2 /* Optional */ ? factory.createToken(58 /* QuestionToken */) : void 0,
                     flags & 4 /* Rest */ ? factory.createArrayTypeNode(tupleConstituentNodes[i]) : tupleConstituentNodes[i]
                   );
-                }
-              } else {
-                for (let i = 0; i < Math.min(arity, tupleConstituentNodes.length); i++) {
-                  const flags = type2.target.elementFlags[i];
+                } else {
                   tupleConstituentNodes[i] = flags & 12 /* Variable */ ? factory.createRestTypeNode(flags & 4 /* Rest */ ? factory.createArrayTypeNode(tupleConstituentNodes[i]) : tupleConstituentNodes[i]) : flags & 2 /* Optional */ ? factory.createOptionalTypeNode(tupleConstituentNodes[i]) : tupleConstituentNodes[i];
                 }
               }
@@ -57764,17 +57762,18 @@ function createTypeChecker(host) {
   function getExpandedParameters(sig, skipUnionExpanding) {
     if (signatureHasRestParameter(sig)) {
       const restIndex = sig.parameters.length - 1;
+      const restName = sig.parameters[restIndex].escapedName;
       const restType = getTypeOfSymbol(sig.parameters[restIndex]);
       if (isTupleType(restType)) {
-        return [expandSignatureParametersWithTupleMembers(restType, restIndex)];
+        return [expandSignatureParametersWithTupleMembers(restType, restIndex, restName)];
       } else if (!skipUnionExpanding && restType.flags & 1048576 /* Union */ && every(restType.types, isTupleType)) {
-        return map(restType.types, (t) => expandSignatureParametersWithTupleMembers(t, restIndex));
+        return map(restType.types, (t) => expandSignatureParametersWithTupleMembers(t, restIndex, restName));
       }
     }
     return [sig.parameters];
-    function expandSignatureParametersWithTupleMembers(restType, restIndex) {
-      const elementTypes = getElementTypes(restType);
-      const associatedNames = getUniqAssociatedNamesFromTupleType(restType);
+    function expandSignatureParametersWithTupleMembers(restType, restIndex, restName) {
+      const elementTypes = getTypeArguments(restType);
+      const associatedNames = getUniqAssociatedNamesFromTupleType(restType, restName);
       const restParams = map(elementTypes, (t, i) => {
         const name = associatedNames && associatedNames[i] ? associatedNames[i] : getParameterNameAtPosition(sig, restIndex + i, restType);
         const flags = restType.target.elementFlags[i];
@@ -57785,10 +57784,10 @@ function createTypeChecker(host) {
       });
       return concatenate(sig.parameters.slice(0, restIndex), restParams);
     }
-    function getUniqAssociatedNamesFromTupleType(type) {
+    function getUniqAssociatedNamesFromTupleType(type, restName) {
       const associatedNamesMap = /* @__PURE__ */ new Map();
-      return map(type.target.labeledElementDeclarations, (labeledElement) => {
-        const name = getTupleElementLabel(labeledElement);
+      return map(type.target.labeledElementDeclarations, (labeledElement, i) => {
+        const name = getTupleElementLabel(labeledElement, i, restName);
         const prevCounter = associatedNamesMap.get(name);
         if (prevCounter === void 0) {
           associatedNamesMap.set(name, 1);
@@ -60722,13 +60721,10 @@ function createTypeChecker(host) {
       return readonly ? globalReadonlyArrayType : globalArrayType;
     }
     const elementFlags = map(node.elements, getTupleElementFlags);
-    const missingName = some(node.elements, (e) => e.kind !== 202 /* NamedTupleMember */);
-    return getTupleTargetType(
-      elementFlags,
-      readonly,
-      /*associatedNames*/
-      missingName ? void 0 : node.elements
-    );
+    return getTupleTargetType(elementFlags, readonly, map(node.elements, memberIfLabeledElementDeclaration));
+  }
+  function memberIfLabeledElementDeclaration(member) {
+    return isNamedTupleMember(member) || isParameter(member) ? member : void 0;
   }
   function isDeferredTypeReferenceNode(node, hasDefaultTypeArguments) {
     return !!getAliasSymbolForTypeNode(node) || isResolvedByTypeAlias(node) && (node.kind === 188 /* ArrayType */ ? mayResolveTypeAlias(node.elementType) : node.kind === 189 /* TupleType */ ? some(node.elements, mayResolveTypeAlias) : hasDefaultTypeArguments || some(node.typeArguments, mayResolveTypeAlias));
@@ -60803,7 +60799,7 @@ function createTypeChecker(host) {
   function isReadonlyTypeOperator(node) {
     return isTypeOperatorNode(node) && node.operator === 148 /* ReadonlyKeyword */;
   }
-  function createTupleType(elementTypes, elementFlags, readonly = false, namedMemberDeclarations) {
+  function createTupleType(elementTypes, elementFlags, readonly = false, namedMemberDeclarations = []) {
     const tupleTarget = getTupleTargetType(elementFlags || map(elementTypes, (_) => 1 /* Required */), readonly, namedMemberDeclarations);
     return tupleTarget === emptyGenericType ? emptyObjectType : elementTypes.length ? createNormalizedTypeReference(tupleTarget, elementTypes) : tupleTarget;
   }
@@ -60811,7 +60807,8 @@ function createTypeChecker(host) {
     if (elementFlags.length === 1 && elementFlags[0] & 4 /* Rest */) {
       return readonly ? globalReadonlyArrayType : globalArrayType;
     }
-    const key = map(elementFlags, (f) => f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*").join() + (readonly ? "R" : "") + (namedMemberDeclarations && namedMemberDeclarations.length ? "," + map(namedMemberDeclarations, getNodeId).join(",") : "");
+    const memberIds = mapDefined(namedMemberDeclarations, (node) => node ? getNodeId(node) : void 0);
+    const key = map(elementFlags, (f) => f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*").join() + (readonly ? "R" : "") + (memberIds.length ? "," + memberIds.join(",") : "");
     let type = tupleTypes.get(key);
     if (!type) {
       tupleTypes.set(key, type = createTupleTargetType(elementFlags, readonly, namedMemberDeclarations));
@@ -60893,7 +60890,7 @@ function createTypeChecker(host) {
     }
     const expandedTypes = [];
     const expandedFlags = [];
-    let expandedDeclarations = [];
+    const expandedDeclarations = [];
     let lastRequiredIndex = -1;
     let firstRestIndex = -1;
     let lastOptionalOrRestIndex = -1;
@@ -60931,7 +60928,7 @@ function createTypeChecker(host) {
       ));
       expandedTypes.splice(firstRestIndex + 1, lastOptionalOrRestIndex - firstRestIndex);
       expandedFlags.splice(firstRestIndex + 1, lastOptionalOrRestIndex - firstRestIndex);
-      expandedDeclarations == null ? void 0 : expandedDeclarations.splice(firstRestIndex + 1, lastOptionalOrRestIndex - firstRestIndex);
+      expandedDeclarations.splice(firstRestIndex + 1, lastOptionalOrRestIndex - firstRestIndex);
     }
     const tupleTarget = getTupleTargetType(expandedFlags, target.readonly, expandedDeclarations);
     return tupleTarget === emptyGenericType ? emptyObjectType : expandedFlags.length ? createTypeReference(tupleTarget, expandedTypes) : tupleTarget;
@@ -60951,11 +60948,7 @@ function createTypeChecker(host) {
         true
       ) : type);
       expandedFlags.push(flags);
-      if (expandedDeclarations && declaration) {
-        expandedDeclarations.push(declaration);
-      } else {
-        expandedDeclarations = void 0;
-      }
+      expandedDeclarations.push(declaration);
     }
   }
   function sliceTupleType(type, index, endSkipCount = 0) {
@@ -65629,7 +65622,6 @@ function createTypeChecker(host) {
       } else if (targetFlags & 8388608 /* IndexedAccess */) {
         if (sourceFlags & 8388608 /* IndexedAccess */) {
           if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-            instantiateType(source2.objectType, reportUnreliableMapper);
             result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
           }
           if (result2) {
@@ -71314,17 +71306,14 @@ function createTypeChecker(host) {
     }
   }
   function getTypeForThisExpressionFromJSDoc(node) {
-    const jsdocType = getJSDocType(node);
-    if (jsdocType && jsdocType.kind === 324 /* JSDocFunctionType */) {
-      const jsDocFunctionType = jsdocType;
-      if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].name && jsDocFunctionType.parameters[0].name.escapedText === "this" /* This */) {
-        return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
-      }
-    }
     const thisTag = getJSDocThisTag(node);
     if (thisTag && thisTag.typeExpression) {
       return getTypeFromTypeNode(thisTag.typeExpression);
     }
+    const signature = getSignatureOfTypeTag(node);
+    if (signature) {
+      return getThisTypeOfSignature(signature);
+    }
   }
   function isInConstructorArgumentInitializer(node, constructorDecl) {
     return !!findAncestor(node, (n) => isFunctionLikeDeclaration(n) ? "quit" : n.kind === 169 /* Parameter */ && n.parent === constructorDecl);
@@ -75226,12 +75215,7 @@ function createTypeChecker(host) {
     }
     const candidates = candidatesOutArray || [];
     reorderCandidates(signatures, candidates, callChainFlags);
-    if (!candidates.length) {
-      if (reportErrors2) {
-        diagnostics.add(getDiagnosticForCallNode(node, Diagnostics.Call_target_does_not_contain_any_signatures));
-      }
-      return resolveErrorCall(node);
-    }
+    Debug.assert(candidates.length, "Revert #54442 and add a testcase with whatever triggered this");
     const args = getEffectiveCallArguments(node);
     const isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
     let argCheckMode = !isDecorator2 && !isSingleNonGenericCandidate && some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
@@ -76683,7 +76667,10 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function getTupleElementLabel(d) {
+  function getTupleElementLabel(d, index, restParameterName = "arg") {
+    if (!d) {
+      return `${restParameterName}_${index}`;
+    }
     Debug.assert(isIdentifier(d.name));
     return d.name.escapedText;
   }
@@ -76697,7 +76684,7 @@ function createTypeChecker(host) {
     if (isTupleType(restType)) {
       const associatedNames = restType.target.labeledElementDeclarations;
       const index = pos - paramCount;
-      return associatedNames && getTupleElementLabel(associatedNames[index]) || restParameter.escapedName + "_" + index;
+      return getTupleElementLabel(associatedNames == null ? void 0 : associatedNames[index], index, restParameter.escapedName);
     }
     return restParameter.escapedName;
   }
@@ -80052,12 +80039,7 @@ function createTypeChecker(host) {
     const elementTypes = node.elements;
     let seenOptionalElement = false;
     let seenRestElement = false;
-    const hasNamedElement = some(elementTypes, isNamedTupleMember);
     for (const e of elementTypes) {
-      if (e.kind !== 202 /* NamedTupleMember */ && hasNamedElement) {
-        grammarErrorOnNode(e, Diagnostics.Tuple_members_must_all_have_names_or_all_not_have_names);
-        break;
-      }
       const flags = getTupleElementFlags(e);
       if (flags & 8 /* Variadic */) {
         const type = getTypeFromTypeNode(e.type);
@@ -112383,6 +112365,21 @@ function transformDeclarations(context) {
     const modifiers = factory2.createModifiersFromModifierFlags(getEffectiveModifierFlags(statement) & (258047 /* All */ ^ 1 /* Export */));
     return factory2.updateModifiers(statement, modifiers);
   }
+  function updateModuleDeclarationAndKeyword(node, modifiers, name, body) {
+    const updated = factory2.updateModuleDeclaration(node, modifiers, name, body);
+    if (isAmbientModule(updated) || updated.flags & 32 /* Namespace */) {
+      return updated;
+    }
+    const fixed = factory2.createModuleDeclaration(
+      updated.modifiers,
+      updated.name,
+      updated.body,
+      updated.flags | 32 /* Namespace */
+    );
+    setOriginalNode(fixed, updated);
+    setTextRange(fixed, updated);
+    return fixed;
+  }
   function transformTopLevelDeclaration(input) {
     if (lateMarkedStatements) {
       while (orderedRemoveItem(lateMarkedStatements, input))
@@ -112570,7 +112567,7 @@ function transformDeclarations(context) {
           needsScopeFixMarker = oldNeedsScopeFix;
           resultHasScopeMarker = oldHasScopeFix;
           const mods = ensureModifiers(input);
-          return cleanup(factory2.updateModuleDeclaration(
+          return cleanup(updateModuleDeclarationAndKeyword(
             input,
             mods,
             isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name,
@@ -112584,7 +112581,7 @@ function transformDeclarations(context) {
           const id = getOriginalNodeId(inner);
           const body = lateStatementReplacementMap.get(id);
           lateStatementReplacementMap.delete(id);
-          return cleanup(factory2.updateModuleDeclaration(
+          return cleanup(updateModuleDeclarationAndKeyword(
             input,
             mods,
             input.name,
@@ -138043,7 +138040,10 @@ function getReplacementExpression(reference, replacement) {
   if (isExpression(parent2) && (getExpressionPrecedence(replacement) < getExpressionPrecedence(parent2) || needsParentheses(parent2))) {
     return factory.createParenthesizedExpression(replacement);
   }
-  if (isFunctionLike(replacement) && isCallLikeExpression(parent2)) {
+  if (isFunctionLike(replacement) && (isCallLikeExpression(parent2) || isPropertyAccessExpression(parent2))) {
+    return factory.createParenthesizedExpression(replacement);
+  }
+  if (isPropertyAccessExpression(parent2) && (isNumericLiteral(replacement) || isObjectLiteralExpression(replacement))) {
     return factory.createParenthesizedExpression(replacement);
   }
   return replacement;
@@ -156661,6 +156661,7 @@ var CompletionSource = /* @__PURE__ */ ((CompletionSource2) => {
   CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
   CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
   CompletionSource2["SwitchCases"] = "SwitchCases/";
+  CompletionSource2["ObjectLiteralMemberWithComma"] = "ObjectLiteralMemberWithComma/";
   return CompletionSource2;
 })(CompletionSource || {});
 var SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {
@@ -157539,6 +157540,7 @@ 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, includeSymbol) {
+  var _a, _b;
   let insertText;
   let filterText;
   let replacementSpan = getReplacementSpanForContextToken(replacementToken);
@@ -157597,6 +157599,12 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
   if ((origin == null ? void 0 : origin.kind) === 64 /* TypeOnlyAlias */) {
     hasAction = true;
   }
+  if (completionKind === 0 /* ObjectPropertyDeclaration */ && contextToken && ((_a = findPrecedingToken(contextToken.pos, sourceFile, contextToken)) == null ? void 0 : _a.kind) !== 28 /* CommaToken */) {
+    if (isMethodDeclaration(contextToken.parent.parent) || isGetAccessorDeclaration(contextToken.parent.parent) || isSetAccessorDeclaration(contextToken.parent.parent) || isSpreadAssignment(contextToken.parent) || ((_b = findAncestor(contextToken.parent, isPropertyAssignment)) == null ? void 0 : _b.getLastToken(sourceFile)) === contextToken || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line) {
+      source = "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */;
+      hasAction = true;
+    }
+  }
   if (preferences.includeCompletionsWithClassMemberSnippets && preferences.includeCompletionsWithInsertText && completionKind === 3 /* MemberLike */ && isClassLikeMemberCompletion(symbol, location, sourceFile)) {
     let importAdder;
     const memberCompletionEntry = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, position, contextToken, formatContext);
@@ -158160,7 +158168,7 @@ function getSourceFromOrigin(origin) {
 }
 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) {
   const start2 = timestamp();
-  const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken);
+  const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken, location);
   const useSemicolons = probablyUsesSemicolons(sourceFile);
   const typeChecker = program.getTypeChecker();
   const uniques = /* @__PURE__ */ new Map();
@@ -158327,7 +158335,7 @@ function getSymbolCompletionFromEntryId(program, log, sourceFile, position, entr
   return firstDefined(symbols, (symbol, index) => {
     const origin = symbolToOriginInfoMap[index];
     const info = getCompletionEntryDisplayNameForSymbol(symbol, getEmitScriptTarget(compilerOptions), origin, completionKind, completionData.isJsxIdentifierExpected);
-    return info && info.name === entryId.name && (entryId.source === "ClassMemberSnippet/" /* ClassMemberSnippet */ && symbol.flags & 106500 /* ClassMember */ || entryId.source === "ObjectLiteralMethodSnippet/" /* ObjectLiteralMethodSnippet */ && symbol.flags & (4 /* Property */ | 8192 /* Method */) || getSourceFromOrigin(origin) === entryId.source) ? { type: "symbol", symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } : void 0;
+    return info && info.name === entryId.name && (entryId.source === "ClassMemberSnippet/" /* ClassMemberSnippet */ && symbol.flags & 106500 /* ClassMember */ || entryId.source === "ObjectLiteralMethodSnippet/" /* ObjectLiteralMethodSnippet */ && symbol.flags & (4 /* Property */ | 8192 /* Method */) || getSourceFromOrigin(origin) === entryId.source || entryId.source === "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */) ? { type: "symbol", symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } : void 0;
   }) || { type: "none" };
 }
 function getCompletionEntryDetails(program, log, sourceFile, position, entryId, host, formatContext, preferences, cancellationToken) {
@@ -158472,6 +158480,21 @@ function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextTo
     Debug.assertIsDefined(codeAction2, "Expected to have a code action for promoting type-only alias");
     return { codeActions: [codeAction2], sourceDisplay: void 0 };
   }
+  if (source === "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */ && contextToken) {
+    const changes = ts_textChanges_exports.ChangeTracker.with(
+      { host, formatContext, preferences },
+      (tracker) => tracker.insertText(sourceFile, contextToken.end, ",")
+    );
+    if (changes) {
+      return {
+        sourceDisplay: void 0,
+        codeActions: [{
+          changes,
+          description: diagnosticToString([Diagnostics.Add_missing_comma_for_object_member_completion_0, name])
+        }]
+      };
+    }
+  }
   if (!origin || !(originIsExport(origin) || originIsResolvedExport(origin))) {
     return { codeActions: void 0, sourceDisplay: void 0 };
   }
@@ -159378,7 +159401,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
   }
   function tryGetObjectLikeCompletionSymbols() {
     const symbolsStartIndex = symbols.length;
-    const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
+    const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position, sourceFile);
     if (!objectLikeContainer)
       return 0 /* Continue */;
     completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159864,7 +159887,8 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
     return node2.getStart(sourceFile) <= position && position <= node2.getEnd();
   }
 }
-function tryGetObjectLikeCompletionContainer(contextToken) {
+function tryGetObjectLikeCompletionContainer(contextToken, position, sourceFile) {
+  var _a;
   if (contextToken) {
     const { parent: parent2 } = contextToken;
     switch (contextToken.kind) {
@@ -159879,7 +159903,29 @@ function tryGetObjectLikeCompletionContainer(contextToken) {
       case 134 /* AsyncKeyword */:
         return tryCast(parent2.parent, isObjectLiteralExpression);
       case 80 /* Identifier */:
-        return contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : void 0;
+        if (contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent)) {
+          return contextToken.parent.parent;
+        } else {
+          if (isObjectLiteralExpression(contextToken.parent.parent) && (isSpreadAssignment(contextToken.parent) || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line)) {
+            return contextToken.parent.parent;
+          }
+          const ancestorNode2 = findAncestor(parent2, isPropertyAssignment);
+          if ((ancestorNode2 == null ? void 0 : ancestorNode2.getLastToken(sourceFile)) === contextToken && isObjectLiteralExpression(ancestorNode2.parent)) {
+            return ancestorNode2.parent;
+          }
+        }
+        break;
+      default:
+        if (((_a = parent2.parent) == null ? void 0 : _a.parent) && (isMethodDeclaration(parent2.parent) || isGetAccessorDeclaration(parent2.parent) || isSetAccessorDeclaration(parent2.parent)) && isObjectLiteralExpression(parent2.parent.parent)) {
+          return parent2.parent.parent;
+        }
+        if (isSpreadAssignment(parent2) && isObjectLiteralExpression(parent2.parent)) {
+          return parent2.parent;
+        }
+        const ancestorNode = findAncestor(parent2, isPropertyAssignment);
+        if (contextToken.kind !== 59 /* ColonToken */ && (ancestorNode == null ? void 0 : ancestorNode.getLastToken(sourceFile)) === contextToken && isObjectLiteralExpression(ancestorNode.parent)) {
+          return ancestorNode.parent;
+        }
     }
   }
   return void 0;
@@ -160346,11 +160392,12 @@ function isModuleSpecifierMissingOrEmpty(specifier) {
     return true;
   return !((_a = tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)) == null ? void 0 : _a.text);
 }
-function getVariableOrParameterDeclaration(contextToken) {
+function getVariableOrParameterDeclaration(contextToken, location) {
   if (!contextToken)
     return;
-  const declaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node) || (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
-  return declaration;
+  const possiblyParameterDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
+  const possiblyVariableDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node));
+  return possiblyParameterDeclaration || possiblyVariableDeclaration;
 }
 function isArrowFunctionBody(node) {
   return node.parent && isArrowFunction(node.parent) && (node.parent.body === node || // const a = () => /**/;

package/lib/tsserverlibrary.d.ts

@@ -6951,7 +6951,7 @@ declare namespace ts {
         hasRestElement: boolean;
         combinedFlags: ElementFlags;
         readonly: boolean;
-        labeledElementDeclarations?: readonly (NamedTupleMember | ParameterDeclaration)[];
+        labeledElementDeclarations?: readonly (NamedTupleMember | ParameterDeclaration | undefined)[];
     }
     interface TupleTypeReference extends TypeReference {
         target: TupleType;