@typescript-deploys/pr-build 5.2.0-pr-52899-20 → 5.2.0-pr-54781-9

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230623`;
+var version = `${versionMajorMinor}.0-insiders.20230626`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7748,7 +7748,6 @@ 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?"),
@@ -60954,7 +60953,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) {
@@ -107537,6 +107535,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))
@@ -107724,7 +107737,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,
@@ -107738,7 +107751,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,

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-insiders.20230623`;
+var version = `${versionMajorMinor}.0-insiders.20230626`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -11269,7 +11269,6 @@ 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?"),
@@ -65630,7 +65629,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) {
@@ -112384,6 +112382,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))
@@ -112571,7 +112584,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,
@@ -112585,7 +112598,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,
@@ -156662,7 +156675,6 @@ var CompletionSource = /* @__PURE__ */ ((CompletionSource2) => {
   CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
   CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
   CompletionSource2["SwitchCases"] = "SwitchCases/";
-  CompletionSource2["ObjectLiteralMemberWithComma"] = "ObjectLiteralMemberWithComma/";
   return CompletionSource2;
 })(CompletionSource || {});
 var SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {
@@ -157541,7 +157553,6 @@ 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);
@@ -157600,10 +157611,6 @@ 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 */ && (isMethodDeclaration(contextToken.parent.parent) || isSpreadAssignment(contextToken.parent) || ((_b = findAncestor(contextToken.parent, (node) => isPropertyAssignment(node))) == null ? void 0 : _b.getLastToken()) === contextToken || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), 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);
@@ -158334,7 +158341,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 || entryId.source === "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */) ? { 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) ? { type: "symbol", symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } : void 0;
   }) || { type: "none" };
 }
 function getCompletionEntryDetails(program, log, sourceFile, position, entryId, host, formatContext, preferences, cancellationToken) {
@@ -158479,21 +158486,6 @@ 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 };
   }
@@ -159400,7 +159392,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
   }
   function tryGetObjectLikeCompletionSymbols() {
     const symbolsStartIndex = symbols.length;
-    const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position);
+    const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
     if (!objectLikeContainer)
       return 0 /* Continue */;
     completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159886,7 +159878,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
     return node2.getStart(sourceFile) <= position && position <= node2.getEnd();
   }
 }
-function tryGetObjectLikeCompletionContainer(contextToken, position) {
+function tryGetObjectLikeCompletionContainer(contextToken) {
   if (contextToken) {
     const { parent: parent2 } = contextToken;
     switch (contextToken.kind) {
@@ -159901,26 +159893,7 @@ function tryGetObjectLikeCompletionContainer(contextToken, position) {
       case 134 /* AsyncKeyword */:
         return tryCast(parent2.parent, isObjectLiteralExpression);
       case 80 /* Identifier */:
-        if (contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent)) {
-          return contextToken.parent.parent;
-        } else {
-          if (isObjectLiteralExpression(contextToken.parent.parent) && (isSpreadAssignment(contextToken.parent) || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), position).line)) {
-            return contextToken.parent.parent;
-          }
-          const ancestorNode2 = findAncestor(parent2, (node) => isPropertyAssignment(node));
-          if (ancestorNode2 && ancestorNode2.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode2.parent)) {
-            return ancestorNode2.parent;
-          }
-        }
-        break;
-      default:
-        if (parent2.parent && parent2.parent.parent && isMethodDeclaration(parent2.parent) && isObjectLiteralExpression(parent2.parent.parent)) {
-          return parent2.parent.parent;
-        }
-        const ancestorNode = findAncestor(parent2, (node) => isPropertyAssignment(node));
-        if (contextToken.kind !== 59 /* ColonToken */ && ancestorNode && ancestorNode.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode.parent)) {
-          return ancestorNode.parent;
-        }
+        return contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : void 0;
     }
   }
   return void 0;

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230623`;
+      version = `${versionMajorMinor}.0-insiders.20230626`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9052,7 +9052,6 @@ ${lanes.join("\n")}
         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?"),
@@ -63397,7 +63396,6 @@ ${lanes.join("\n")}
         } 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) {
@@ -110461,6 +110459,21 @@ ${lanes.join("\n")}
       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))
@@ -110648,7 +110661,7 @@ ${lanes.join("\n")}
             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,
@@ -110662,7 +110675,7 @@ ${lanes.join("\n")}
             const id = getOriginalNodeId(inner);
             const body = lateStatementReplacementMap.get(id);
             lateStatementReplacementMap.delete(id);
-            return cleanup(factory2.updateModuleDeclaration(
+            return cleanup(updateModuleDeclarationAndKeyword(
               input,
               mods,
               input.name,
@@ -156773,7 +156786,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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);
@@ -156832,10 +156844,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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 */ && (isMethodDeclaration(contextToken.parent.parent) || isSpreadAssignment(contextToken.parent) || ((_b = findAncestor(contextToken.parent, (node) => isPropertyAssignment(node))) == null ? void 0 : _b.getLastToken()) === contextToken || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), 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);
@@ -157566,7 +157574,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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 || entryId.source === "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */) ? { 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) ? { type: "symbol", symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } : void 0;
     }) || { type: "none" };
   }
   function getCompletionEntryDetails(program, log, sourceFile, position, entryId, host, formatContext, preferences, cancellationToken) {
@@ -157711,21 +157719,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       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 };
     }
@@ -158623,7 +158616,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function tryGetObjectLikeCompletionSymbols() {
       const symbolsStartIndex = symbols.length;
-      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position);
+      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
       if (!objectLikeContainer)
         return 0 /* Continue */;
       completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159109,7 +159102,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return node2.getStart(sourceFile) <= position && position <= node2.getEnd();
     }
   }
-  function tryGetObjectLikeCompletionContainer(contextToken, position) {
+  function tryGetObjectLikeCompletionContainer(contextToken) {
     if (contextToken) {
       const { parent: parent2 } = contextToken;
       switch (contextToken.kind) {
@@ -159124,26 +159117,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         case 134 /* AsyncKeyword */:
           return tryCast(parent2.parent, isObjectLiteralExpression);
         case 80 /* Identifier */:
-          if (contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent)) {
-            return contextToken.parent.parent;
-          } else {
-            if (isObjectLiteralExpression(contextToken.parent.parent) && (isSpreadAssignment(contextToken.parent) || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), position).line)) {
-              return contextToken.parent.parent;
-            }
-            const ancestorNode2 = findAncestor(parent2, (node) => isPropertyAssignment(node));
-            if (ancestorNode2 && ancestorNode2.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode2.parent)) {
-              return ancestorNode2.parent;
-            }
-          }
-          break;
-        default:
-          if (parent2.parent && parent2.parent.parent && isMethodDeclaration(parent2.parent) && isObjectLiteralExpression(parent2.parent.parent)) {
-            return parent2.parent.parent;
-          }
-          const ancestorNode = findAncestor(parent2, (node) => isPropertyAssignment(node));
-          if (contextToken.kind !== 59 /* ColonToken */ && ancestorNode && ancestorNode.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode.parent)) {
-            return ancestorNode.parent;
-          }
+          return contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : void 0;
       }
     }
     return void 0;
@@ -159685,7 +159659,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
         CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
         CompletionSource2["SwitchCases"] = "SwitchCases/";
-        CompletionSource2["ObjectLiteralMemberWithComma"] = "ObjectLiteralMemberWithComma/";
         return CompletionSource2;
       })(CompletionSource || {});
       SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230623`;
+      version = `${versionMajorMinor}.0-insiders.20230626`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9052,7 +9052,6 @@ ${lanes.join("\n")}
         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?"),
@@ -63397,7 +63396,6 @@ ${lanes.join("\n")}
         } 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) {
@@ -110461,6 +110459,21 @@ ${lanes.join("\n")}
       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))
@@ -110648,7 +110661,7 @@ ${lanes.join("\n")}
             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,
@@ -110662,7 +110675,7 @@ ${lanes.join("\n")}
             const id = getOriginalNodeId(inner);
             const body = lateStatementReplacementMap.get(id);
             lateStatementReplacementMap.delete(id);
-            return cleanup(factory2.updateModuleDeclaration(
+            return cleanup(updateModuleDeclarationAndKeyword(
               input,
               mods,
               input.name,
@@ -156788,7 +156801,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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);
@@ -156847,10 +156859,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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 */ && (isMethodDeclaration(contextToken.parent.parent) || isSpreadAssignment(contextToken.parent) || ((_b = findAncestor(contextToken.parent, (node) => isPropertyAssignment(node))) == null ? void 0 : _b.getLastToken()) === contextToken || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), 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);
@@ -157581,7 +157589,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     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 || entryId.source === "ObjectLiteralMemberWithComma/" /* ObjectLiteralMemberWithComma */) ? { 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) ? { type: "symbol", symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } : void 0;
     }) || { type: "none" };
   }
   function getCompletionEntryDetails(program, log, sourceFile, position, entryId, host, formatContext, preferences, cancellationToken) {
@@ -157726,21 +157734,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       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 };
     }
@@ -158638,7 +158631,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function tryGetObjectLikeCompletionSymbols() {
       const symbolsStartIndex = symbols.length;
-      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken, position);
+      const objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
       if (!objectLikeContainer)
         return 0 /* Continue */;
       completionKind = 0 /* ObjectPropertyDeclaration */;
@@ -159124,7 +159117,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return node2.getStart(sourceFile) <= position && position <= node2.getEnd();
     }
   }
-  function tryGetObjectLikeCompletionContainer(contextToken, position) {
+  function tryGetObjectLikeCompletionContainer(contextToken) {
     if (contextToken) {
       const { parent: parent2 } = contextToken;
       switch (contextToken.kind) {
@@ -159139,26 +159132,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         case 134 /* AsyncKeyword */:
           return tryCast(parent2.parent, isObjectLiteralExpression);
         case 80 /* Identifier */:
-          if (contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent)) {
-            return contextToken.parent.parent;
-          } else {
-            if (isObjectLiteralExpression(contextToken.parent.parent) && (isSpreadAssignment(contextToken.parent) || isShorthandPropertyAssignment(contextToken.parent) && getLineAndCharacterOfPosition(contextToken.getSourceFile(), contextToken.getEnd()).line !== getLineAndCharacterOfPosition(contextToken.getSourceFile(), position).line)) {
-              return contextToken.parent.parent;
-            }
-            const ancestorNode2 = findAncestor(parent2, (node) => isPropertyAssignment(node));
-            if (ancestorNode2 && ancestorNode2.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode2.parent)) {
-              return ancestorNode2.parent;
-            }
-          }
-          break;
-        default:
-          if (parent2.parent && parent2.parent.parent && isMethodDeclaration(parent2.parent) && isObjectLiteralExpression(parent2.parent.parent)) {
-            return parent2.parent.parent;
-          }
-          const ancestorNode = findAncestor(parent2, (node) => isPropertyAssignment(node));
-          if (contextToken.kind !== 59 /* ColonToken */ && ancestorNode && ancestorNode.getLastToken() === contextToken && isObjectLiteralExpression(ancestorNode.parent)) {
-            return ancestorNode.parent;
-          }
+          return contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : void 0;
       }
     }
     return void 0;
@@ -159700,7 +159674,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
         CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
         CompletionSource2["SwitchCases"] = "SwitchCases/";
-        CompletionSource2["ObjectLiteralMemberWithComma"] = "ObjectLiteralMemberWithComma/";
         return CompletionSource2;
       })(CompletionSource || {});
       SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230623`;
+var version = `${versionMajorMinor}.0-insiders.20230626`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7122,7 +7122,6 @@ 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?"),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-52899-20",
+  "version": "5.2.0-pr-54781-9",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -115,5 +115,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "c1175951e647970ae871beecc7dc204a7daeafb1"
+  "gitHead": "b62f8859ac8428b17034dbf3a821fb772d84955b"
 }