@typescript-deploys/pr-build 5.2.0-pr-54377-7 → 5.2.0-pr-54052-23

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.20230524`;
+var version = `${versionMajorMinor}.0-insiders.20230526`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -42656,6 +42656,7 @@ var CheckMode = /* @__PURE__ */ ((CheckMode3) => {
   CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
   CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
   CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
+  CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
   return CheckMode3;
 })(CheckMode || {});
 var SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -58527,6 +58528,10 @@ function createTypeChecker(host) {
       return true;
     }
     switch (node.kind) {
+      case 233 /* AsExpression */:
+        if (!isConstAssertion(node)) {
+          break;
+        }
       case 293 /* JsxExpression */:
       case 216 /* ParenthesizedExpression */:
         return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
@@ -61774,7 +61779,7 @@ function createTypeChecker(host) {
         }
       }
     }
-    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i]), 0 /* None */) : target;
     return filtered.flags & 131072 /* Never */ ? target : filtered;
   }
   function isWeakType(type) {
@@ -62753,8 +62758,6 @@ function createTypeChecker(host) {
     return context && context.mapper;
   }
   function couldContainTypeVariables(type) {
-    if (type.flags & 67359327 /* Intrinsic */)
-      return false;
     const objectFlags = getObjectFlags(type);
     if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
       return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
@@ -64807,7 +64810,7 @@ function createTypeChecker(host) {
           target.antecedents = saveAntecedents;
         } else if (flags & 2 /* Start */) {
           const container = flow.node;
-          if (container && container !== flowContainer && reference.kind !== 210 /* PropertyAccessExpression */ && reference.kind !== 211 /* ElementAccessExpression */ && reference.kind !== 110 /* ThisKeyword */) {
+          if (container && container !== flowContainer && reference.kind !== 210 /* PropertyAccessExpression */ && reference.kind !== 211 /* ElementAccessExpression */ && !(reference.kind === 110 /* ThisKeyword */ && container.kind !== 218 /* ArrowFunction */)) {
             flow = container.flowNode;
             continue;
           }
@@ -73294,7 +73297,7 @@ function createTypeChecker(host) {
         Debug.assertIsDefined(leftType);
         const rightType = getLastResult(state);
         Debug.assertIsDefined(rightType);
-        result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, node);
+        result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, state.checkMode, node);
       }
       state.skip = false;
       setLeftType(
@@ -73356,9 +73359,9 @@ function createTypeChecker(host) {
       leftType = checkExpression(left, checkMode);
     }
     const rightType = checkExpression(right, checkMode);
-    return checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, errorNode);
+    return checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, checkMode, errorNode);
   }
-  function checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, errorNode) {
+  function checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, checkMode, errorNode) {
     const operator = operatorToken.kind;
     switch (operator) {
       case 42 /* AsteriskToken */:
@@ -73515,12 +73518,14 @@ function createTypeChecker(host) {
       case 36 /* ExclamationEqualsToken */:
       case 37 /* EqualsEqualsEqualsToken */:
       case 38 /* ExclamationEqualsEqualsToken */:
-        if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
-          const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
-          error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
+        if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+          if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
+            const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
+            error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
+          }
+          checkNaNEquality(errorNode, operator, left, right);
+          reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
         }
-        checkNaNEquality(errorNode, operator, left, right);
-        reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
         return booleanType;
       case 104 /* InstanceOfKeyword */:
         return checkInstanceOfExpression(left, right, leftType, rightType);
@@ -73831,7 +73836,7 @@ function createTypeChecker(host) {
     }
   }
   function checkConditionalExpression(node, checkMode) {
-    const type = checkTruthinessExpression(node.condition);
+    const type = checkTruthinessExpression(node.condition, checkMode);
     checkTestingKnownTruthyCallableOrAwaitableType(node.condition, type, node.whenTrue);
     const type1 = checkExpression(node.whenTrue, checkMode);
     const type2 = checkExpression(node.whenFalse, checkMode);
@@ -74172,7 +74177,7 @@ function createTypeChecker(host) {
       }
     }
     const startInvocationCount = flowInvocationCount;
-    const type = checkExpression(node);
+    const type = checkExpression(node, 128 /* TypeOnly */);
     if (flowInvocationCount !== startInvocationCount) {
       const cache = flowTypeCache || (flowTypeCache = []);
       cache[getNodeId(node)] = type;

package/lib/tsserver.js

@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230524`;
+var version = `${versionMajorMinor}.0-insiders.20230526`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -47307,6 +47307,7 @@ var CheckMode = /* @__PURE__ */ ((CheckMode3) => {
   CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
   CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
   CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
+  CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
   return CheckMode3;
 })(CheckMode || {});
 var SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -63178,6 +63179,10 @@ function createTypeChecker(host) {
       return true;
     }
     switch (node.kind) {
+      case 233 /* AsExpression */:
+        if (!isConstAssertion(node)) {
+          break;
+        }
       case 293 /* JsxExpression */:
       case 216 /* ParenthesizedExpression */:
         return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
@@ -66425,7 +66430,7 @@ function createTypeChecker(host) {
         }
       }
     }
-    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i]), 0 /* None */) : target;
     return filtered.flags & 131072 /* Never */ ? target : filtered;
   }
   function isWeakType(type) {
@@ -67404,8 +67409,6 @@ function createTypeChecker(host) {
     return context && context.mapper;
   }
   function couldContainTypeVariables(type) {
-    if (type.flags & 67359327 /* Intrinsic */)
-      return false;
     const objectFlags = getObjectFlags(type);
     if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
       return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
@@ -69458,7 +69461,7 @@ function createTypeChecker(host) {
           target.antecedents = saveAntecedents;
         } else if (flags & 2 /* Start */) {
           const container = flow.node;
-          if (container && container !== flowContainer && reference.kind !== 210 /* PropertyAccessExpression */ && reference.kind !== 211 /* ElementAccessExpression */ && reference.kind !== 110 /* ThisKeyword */) {
+          if (container && container !== flowContainer && reference.kind !== 210 /* PropertyAccessExpression */ && reference.kind !== 211 /* ElementAccessExpression */ && !(reference.kind === 110 /* ThisKeyword */ && container.kind !== 218 /* ArrowFunction */)) {
             flow = container.flowNode;
             continue;
           }
@@ -77945,7 +77948,7 @@ function createTypeChecker(host) {
         Debug.assertIsDefined(leftType);
         const rightType = getLastResult(state);
         Debug.assertIsDefined(rightType);
-        result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, node);
+        result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, state.checkMode, node);
       }
       state.skip = false;
       setLeftType(
@@ -78007,9 +78010,9 @@ function createTypeChecker(host) {
       leftType = checkExpression(left, checkMode);
     }
     const rightType = checkExpression(right, checkMode);
-    return checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, errorNode);
+    return checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, checkMode, errorNode);
   }
-  function checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, errorNode) {
+  function checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, checkMode, errorNode) {
     const operator = operatorToken.kind;
     switch (operator) {
       case 42 /* AsteriskToken */:
@@ -78166,12 +78169,14 @@ function createTypeChecker(host) {
       case 36 /* ExclamationEqualsToken */:
       case 37 /* EqualsEqualsEqualsToken */:
       case 38 /* ExclamationEqualsEqualsToken */:
-        if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
-          const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
-          error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
+        if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+          if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
+            const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
+            error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
+          }
+          checkNaNEquality(errorNode, operator, left, right);
+          reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
         }
-        checkNaNEquality(errorNode, operator, left, right);
-        reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
         return booleanType;
       case 104 /* InstanceOfKeyword */:
         return checkInstanceOfExpression(left, right, leftType, rightType);
@@ -78482,7 +78487,7 @@ function createTypeChecker(host) {
     }
   }
   function checkConditionalExpression(node, checkMode) {
-    const type = checkTruthinessExpression(node.condition);
+    const type = checkTruthinessExpression(node.condition, checkMode);
     checkTestingKnownTruthyCallableOrAwaitableType(node.condition, type, node.whenTrue);
     const type1 = checkExpression(node.whenTrue, checkMode);
     const type2 = checkExpression(node.whenFalse, checkMode);
@@ -78823,7 +78828,7 @@ function createTypeChecker(host) {
       }
     }
     const startInvocationCount = flowInvocationCount;
-    const type = checkExpression(node);
+    const type = checkExpression(node, 128 /* TypeOnly */);
     if (flowInvocationCount !== startInvocationCount) {
       const cache = flowTypeCache || (flowTypeCache = []);
       cache[getNodeId(node)] = type;
@@ -135601,12 +135606,12 @@ function getEditsForRefactor(context, refactorName13, actionName2, interactiveRe
 var refactorName = "Convert export";
 var defaultToNamedAction = {
   name: "Convert default export to named export",
-  description: Diagnostics.Convert_default_export_to_named_export.message,
+  description: getLocaleSpecificMessage(Diagnostics.Convert_default_export_to_named_export),
   kind: "refactor.rewrite.export.named"
 };
 var namedToDefaultAction = {
   name: "Convert named export to default export",
-  description: Diagnostics.Convert_named_export_to_default_export.message,
+  description: getLocaleSpecificMessage(Diagnostics.Convert_named_export_to_default_export),
   kind: "refactor.rewrite.export.default"
 };
 registerRefactor(refactorName, {
@@ -135624,7 +135629,7 @@ registerRefactor(refactorName, {
     }
     if (context.preferences.provideRefactorNotApplicableReason) {
       return [
-        { name: refactorName, description: Diagnostics.Convert_default_export_to_named_export.message, actions: [
+        { name: refactorName, description: getLocaleSpecificMessage(Diagnostics.Convert_default_export_to_named_export), actions: [
           { ...defaultToNamedAction, notApplicableReason: info.error },
           { ...namedToDefaultAction, notApplicableReason: info.error }
         ] }
@@ -135847,17 +135852,17 @@ var refactorName2 = "Convert import";
 var actions = {
   [0 /* Named */]: {
     name: "Convert namespace import to named imports",
-    description: Diagnostics.Convert_namespace_import_to_named_imports.message,
+    description: getLocaleSpecificMessage(Diagnostics.Convert_namespace_import_to_named_imports),
     kind: "refactor.rewrite.import.named"
   },
   [2 /* Namespace */]: {
     name: "Convert named imports to namespace import",
-    description: Diagnostics.Convert_named_imports_to_namespace_import.message,
+    description: getLocaleSpecificMessage(Diagnostics.Convert_named_imports_to_namespace_import),
     kind: "refactor.rewrite.import.namespace"
   },
   [1 /* Default */]: {
     name: "Convert named imports to default import",
-    description: Diagnostics.Convert_named_imports_to_default_import.message,
+    description: getLocaleSpecificMessage(Diagnostics.Convert_named_imports_to_default_import),
     kind: "refactor.rewrite.import.default"
   }
 };
@@ -137146,6 +137151,10 @@ function getRangeToMove(context) {
   if (isNamedDeclaration(startStatement) && startStatement.name && rangeContainsRange(startStatement.name, range)) {
     return { toMove: [statements[startNodeIndex]], afterLast: statements[startNodeIndex + 1] };
   }
+  const overloadRangeToMove = getOverloadRangeToMove(file, startStatement);
+  if (overloadRangeToMove) {
+    return overloadRangeToMove;
+  }
   if (range.pos > startStatement.getStart(file))
     return void 0;
   const afterEndNodeIndex = findIndex(statements, (s) => s.end > range.end, startNodeIndex);
@@ -137341,13 +137350,26 @@ function isNonVariableTopLevelDeclaration(node) {
       return false;
   }
 }
+function getOverloadRangeToMove(sourceFile, statement) {
+  if (isFunctionLikeDeclaration(statement)) {
+    const declarations = statement.symbol.declarations;
+    if (declarations === void 0 || length(declarations) <= 1 || !contains(declarations, statement)) {
+      return void 0;
+    }
+    const lastDecl = declarations[length(declarations) - 1];
+    const statementsToMove = mapDefined(declarations, (d) => getSourceFileOfNode(d) === sourceFile && isStatement(d) ? d : void 0);
+    const end = findLastIndex(sourceFile.statements, (s) => s.end > lastDecl.end);
+    return { toMove: statementsToMove, afterLast: end >= 0 ? sourceFile.statements[end] : void 0 };
+  }
+  return void 0;
+}
 
 // src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts
 var ts_refactor_addOrRemoveBracesToArrowFunction_exports = {};
 
 // src/services/refactors/convertOverloadListToSingleSignature.ts
 var refactorName5 = "Convert overload list to single signature";
-var refactorDescription = Diagnostics.Convert_overload_list_to_single_signature.message;
+var refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_overload_list_to_single_signature);
 var functionOverloadAction = {
   name: refactorName5,
   description: refactorDescription,
@@ -137559,15 +137581,15 @@ function getConvertableOverloadListAtPosition(file, startPosition, program) {
 
 // src/services/refactors/addOrRemoveBracesToArrowFunction.ts
 var refactorName6 = "Add or remove braces in an arrow function";
-var refactorDescription2 = Diagnostics.Add_or_remove_braces_in_an_arrow_function.message;
+var refactorDescription2 = getLocaleSpecificMessage(Diagnostics.Add_or_remove_braces_in_an_arrow_function);
 var addBracesAction = {
   name: "Add braces to arrow function",
-  description: Diagnostics.Add_braces_to_arrow_function.message,
+  description: getLocaleSpecificMessage(Diagnostics.Add_braces_to_arrow_function),
   kind: "refactor.rewrite.arrow.braces.add"
 };
 var removeBracesAction = {
   name: "Remove braces from arrow function",
-  description: Diagnostics.Remove_braces_from_arrow_function.message,
+  description: getLocaleSpecificMessage(Diagnostics.Remove_braces_from_arrow_function),
   kind: "refactor.rewrite.arrow.braces.remove"
 };
 registerRefactor(refactorName6, {
@@ -138521,7 +138543,7 @@ function getEditsForToTemplateLiteral(context, node) {
   }
 }
 function isNotEqualsOperator(node) {
-  return node.operatorToken.kind !== 64 /* EqualsToken */;
+  return !(node.operatorToken.kind === 64 /* EqualsToken */ || node.operatorToken.kind === 65 /* PlusEqualsToken */);
 }
 function getParentBinaryExpression(expr) {
   const container = findAncestor(expr.parent, (n) => {
@@ -140497,7 +140519,7 @@ var ts_refactor_generateGetAccessorAndSetAccessor_exports = {};
 
 // src/services/refactors/generateGetAccessorAndSetAccessor.ts
 var actionName = "Generate 'get' and 'set' accessors";
-var actionDescription = Diagnostics.Generate_get_and_set_accessors.message;
+var actionDescription = getLocaleSpecificMessage(Diagnostics.Generate_get_and_set_accessors);
 var generateGetSetAction = {
   name: actionName,
   description: actionDescription,
@@ -140554,7 +140576,7 @@ var ts_refactor_inferFunctionReturnType_exports = {};
 
 // src/services/refactors/inferFunctionReturnType.ts
 var refactorName12 = "Infer function return type";
-var refactorDescription6 = Diagnostics.Infer_function_return_type.message;
+var refactorDescription6 = getLocaleSpecificMessage(Diagnostics.Infer_function_return_type);
 var inferReturnTypeAction = {
   name: refactorName12,
   description: refactorDescription6,
@@ -141897,7 +141919,11 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       onUnRecoverableConfigFileDiagnostic: noop
     };
     const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
+    let releasedScriptKinds = /* @__PURE__ */ new Set();
     if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+      compilerHost = void 0;
+      parsedCommandLines = void 0;
+      releasedScriptKinds = void 0;
       return;
     }
     const options = {
@@ -141910,6 +141936,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     program = createProgram(options);
     compilerHost = void 0;
     parsedCommandLines = void 0;
+    releasedScriptKinds = void 0;
     sourceMapper.clearCache();
     program.getTypeChecker();
     return;
@@ -141964,10 +141991,11 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       if (!shouldCreateNewSourceFile) {
         const oldSourceFile = program && program.getSourceFileByPath(path);
         if (oldSourceFile) {
-          if (scriptKind === oldSourceFile.scriptKind) {
+          if (scriptKind === oldSourceFile.scriptKind || releasedScriptKinds.has(oldSourceFile.resolvedPath)) {
             return documentRegistry.updateDocumentWithKey(fileName, path, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions);
           } else {
             documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat);
+            releasedScriptKinds.add(oldSourceFile.resolvedPath);
           }
         }
       }
@@ -150447,9 +150475,6 @@ function getActionsForMissingMethodDeclaration(context, info) {
   if (call === void 0) {
     return void 0;
   }
-  if (isPrivateIdentifier(token)) {
-    return void 0;
-  }
   const methodName = token.text;
   const addMethodDeclarationChanges = (modifierFlags2) => ts_textChanges_exports.ChangeTracker.with(context, (t) => addMethodDeclaration(context, t, call, token, modifierFlags2, parentDeclaration, declSourceFile));
   const actions2 = [createCodeFixAction(fixMissingMember, addMethodDeclarationChanges(modifierFlags & 32 /* Static */), [modifierFlags & 32 /* Static */ ? Diagnostics.Declare_static_method_0 : Diagnostics.Declare_method_0, methodName], fixMissingMember, Diagnostics.Add_all_missing_members)];
@@ -153499,6 +153524,7 @@ function createSignatureDeclarationFromCallExpression(kind, context, importAdder
         type === void 0 ? factory.createKeywordTypeNode(159 /* UnknownKeyword */) : type
       );
     case 261 /* FunctionDeclaration */:
+      Debug.assert(typeof name === "string" || isIdentifier(name), "Unexpected name");
       return factory.createFunctionDeclaration(
         modifiers,
         asteriskToken,
@@ -161520,9 +161546,9 @@ var Core;
     if (refNode.parent.kind === 303 /* ShorthandPropertyAssignment */) {
       getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference2);
     }
-    const containingClass = getContainingClassIfInHeritageClause(refNode);
-    if (containingClass) {
-      addReference2(containingClass);
+    const containingNode = getContainingNodeIfInHeritageClause(refNode);
+    if (containingNode) {
+      addReference2(containingNode);
       return;
     }
     const typeNode = findAncestor(refNode, (a) => !isQualifiedName(a.parent) && !isTypeNode(a.parent) && !isTypeElement(a.parent));
@@ -161549,8 +161575,8 @@ var Core;
         addReference2(e);
     }
   }
-  function getContainingClassIfInHeritageClause(node) {
-    return isIdentifier(node) || isPropertyAccessExpression(node) ? getContainingClassIfInHeritageClause(node.parent) : isExpressionWithTypeArguments(node) ? tryCast(node.parent.parent, isClassLike) : void 0;
+  function getContainingNodeIfInHeritageClause(node) {
+    return isIdentifier(node) || isPropertyAccessExpression(node) ? getContainingNodeIfInHeritageClause(node.parent) : isExpressionWithTypeArguments(node) ? tryCast(node.parent.parent, or(isClassLike, isInterfaceDeclaration)) : void 0;
   }
   function isImplementationExpression(node) {
     switch (node.kind) {
@@ -163101,7 +163127,7 @@ function getDocCommentTemplateAtPosition(newLine, sourceFile, position, options)
   const tags = (parameters ? parameterDocComments(parameters || [], isJavaScriptFile, indentationStr, newLine) : "") + (hasReturn2 ? returnsDocComment(indentationStr, newLine) : "");
   const openComment = "/**";
   const closeComment = " */";
-  const hasTag = (commentOwnerJsDoc || []).some((jsDoc) => !!jsDoc.tags);
+  const hasTag = length(getJSDocTags(commentOwner)) > 0;
   if (tags && !hasTag) {
     const preamble = openComment + newLine + indentationStr + " * ";
     const endLine = tokenStart === position ? newLine + indentationStr : "";
@@ -168452,7 +168478,8 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
     }
     processNode(enclosingNode, enclosingNode, startLine, undecoratedStartLine, initialIndentation, delta);
   }
-  if (!formattingScanner.isOnToken()) {
+  const remainingTrivia = formattingScanner.getCurrentLeadingTrivia();
+  if (remainingTrivia) {
     const indentation = SmartIndenter.nodeWillIndentChild(
       options,
       enclosingNode,
@@ -168462,25 +168489,30 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
       /*indentByDefault*/
       false
     ) ? initialIndentation + options.indentSize : initialIndentation;
-    const leadingTrivia = formattingScanner.getCurrentLeadingTrivia();
-    if (leadingTrivia) {
-      indentTriviaItems(
-        leadingTrivia,
-        indentation,
-        /*indentNextTokenOrTrivia*/
-        false,
-        (item) => processRange(
+    indentTriviaItems(
+      remainingTrivia,
+      indentation,
+      /*indentNextTokenOrTrivia*/
+      true,
+      (item) => {
+        processRange(
           item,
           sourceFile.getLineAndCharacterOfPosition(item.pos),
           enclosingNode,
           enclosingNode,
           /*dynamicIndentation*/
           void 0
-        )
-      );
-      if (options.trimTrailingWhitespace !== false) {
-        trimTrailingWhitespacesForRemainingRange(leadingTrivia);
+        );
+        insertIndentation(
+          item.pos,
+          indentation,
+          /*lineAdded*/
+          false
+        );
       }
+    );
+    if (options.trimTrailingWhitespace !== false) {
+      trimTrailingWhitespacesForRemainingRange(remainingTrivia);
     }
   }
   if (previousRange && formattingScanner.getTokenFullStart() >= originalRange.end) {

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230524`;
+      version = `${versionMajorMinor}.0-insiders.20230526`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -60969,6 +60969,10 @@ ${lanes.join("\n")}
         return true;
       }
       switch (node.kind) {
+        case 233 /* AsExpression */:
+          if (!isConstAssertion(node)) {
+            break;
+          }
         case 293 /* JsxExpression */:
         case 216 /* ParenthesizedExpression */:
           return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
@@ -64216,7 +64220,7 @@ ${lanes.join("\n")}
           }
         }
       }
-      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i]), 0 /* None */) : target;
       return filtered.flags & 131072 /* Never */ ? target : filtered;
     }
     function isWeakType(type) {
@@ -65195,8 +65199,6 @@ ${lanes.join("\n")}
       return context && context.mapper;
     }
     function couldContainTypeVariables(type) {
-      if (type.flags & 67359327 /* Intrinsic */)
-        return false;
       const objectFlags = getObjectFlags(type);
       if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
         return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
@@ -67249,7 +67251,7 @@ ${lanes.join("\n")}
             target.antecedents = saveAntecedents;
           } else if (flags & 2 /* Start */) {
             const container = flow.node;
-            if (container && container !== flowContainer && reference.kind !== 210 /* PropertyAccessExpression */ && reference.kind !== 211 /* ElementAccessExpression */ && reference.kind !== 110 /* ThisKeyword */) {
+            if (container && container !== flowContainer && reference.kind !== 210 /* PropertyAccessExpression */ && reference.kind !== 211 /* ElementAccessExpression */ && !(reference.kind === 110 /* ThisKeyword */ && container.kind !== 218 /* ArrowFunction */)) {
               flow = container.flowNode;
               continue;
             }
@@ -75736,7 +75738,7 @@ ${lanes.join("\n")}
           Debug.assertIsDefined(leftType);
           const rightType = getLastResult(state);
           Debug.assertIsDefined(rightType);
-          result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, node);
+          result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, state.checkMode, node);
         }
         state.skip = false;
         setLeftType(
@@ -75798,9 +75800,9 @@ ${lanes.join("\n")}
         leftType = checkExpression(left, checkMode);
       }
       const rightType = checkExpression(right, checkMode);
-      return checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, errorNode);
+      return checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, checkMode, errorNode);
     }
-    function checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, errorNode) {
+    function checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, checkMode, errorNode) {
       const operator = operatorToken.kind;
       switch (operator) {
         case 42 /* AsteriskToken */:
@@ -75957,12 +75959,14 @@ ${lanes.join("\n")}
         case 36 /* ExclamationEqualsToken */:
         case 37 /* EqualsEqualsEqualsToken */:
         case 38 /* ExclamationEqualsEqualsToken */:
-          if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
-            const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
-            error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
+          if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+            if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
+              const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
+              error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
+            }
+            checkNaNEquality(errorNode, operator, left, right);
+            reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
           }
-          checkNaNEquality(errorNode, operator, left, right);
-          reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
           return booleanType;
         case 104 /* InstanceOfKeyword */:
           return checkInstanceOfExpression(left, right, leftType, rightType);
@@ -76273,7 +76277,7 @@ ${lanes.join("\n")}
       }
     }
     function checkConditionalExpression(node, checkMode) {
-      const type = checkTruthinessExpression(node.condition);
+      const type = checkTruthinessExpression(node.condition, checkMode);
       checkTestingKnownTruthyCallableOrAwaitableType(node.condition, type, node.whenTrue);
       const type1 = checkExpression(node.whenTrue, checkMode);
       const type2 = checkExpression(node.whenFalse, checkMode);
@@ -76614,7 +76618,7 @@ ${lanes.join("\n")}
         }
       }
       const startInvocationCount = flowInvocationCount;
-      const type = checkExpression(node);
+      const type = checkExpression(node, 128 /* TypeOnly */);
       if (flowInvocationCount !== startInvocationCount) {
         const cache = flowTypeCache || (flowTypeCache = []);
         cache[getNodeId(node)] = type;
@@ -85824,6 +85828,7 @@ ${lanes.join("\n")}
         CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
         CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
+        CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
         return CheckMode3;
       })(CheckMode || {});
       SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -134188,12 +134193,12 @@ ${lanes.join("\n")}
       refactorName = "Convert export";
       defaultToNamedAction = {
         name: "Convert default export to named export",
-        description: Diagnostics.Convert_default_export_to_named_export.message,
+        description: getLocaleSpecificMessage(Diagnostics.Convert_default_export_to_named_export),
         kind: "refactor.rewrite.export.named"
       };
       namedToDefaultAction = {
         name: "Convert named export to default export",
-        description: Diagnostics.Convert_named_export_to_default_export.message,
+        description: getLocaleSpecificMessage(Diagnostics.Convert_named_export_to_default_export),
         kind: "refactor.rewrite.export.default"
       };
       registerRefactor(refactorName, {
@@ -134211,7 +134216,7 @@ ${lanes.join("\n")}
           }
           if (context.preferences.provideRefactorNotApplicableReason) {
             return [
-              { name: refactorName, description: Diagnostics.Convert_default_export_to_named_export.message, actions: [
+              { name: refactorName, description: getLocaleSpecificMessage(Diagnostics.Convert_default_export_to_named_export), actions: [
                 { ...defaultToNamedAction, notApplicableReason: info.error },
                 { ...namedToDefaultAction, notApplicableReason: info.error }
               ] }
@@ -134413,17 +134418,17 @@ ${lanes.join("\n")}
       actions = {
         [0 /* Named */]: {
           name: "Convert namespace import to named imports",
-          description: Diagnostics.Convert_namespace_import_to_named_imports.message,
+          description: getLocaleSpecificMessage(Diagnostics.Convert_namespace_import_to_named_imports),
           kind: "refactor.rewrite.import.named"
         },
         [2 /* Namespace */]: {
           name: "Convert named imports to namespace import",
-          description: Diagnostics.Convert_named_imports_to_namespace_import.message,
+          description: getLocaleSpecificMessage(Diagnostics.Convert_named_imports_to_namespace_import),
           kind: "refactor.rewrite.import.namespace"
         },
         [1 /* Default */]: {
           name: "Convert named imports to default import",
-          description: Diagnostics.Convert_named_imports_to_default_import.message,
+          description: getLocaleSpecificMessage(Diagnostics.Convert_named_imports_to_default_import),
           kind: "refactor.rewrite.import.default"
         }
       };
@@ -135525,6 +135530,10 @@ ${lanes.join("\n")}
     if (isNamedDeclaration(startStatement) && startStatement.name && rangeContainsRange(startStatement.name, range)) {
       return { toMove: [statements[startNodeIndex]], afterLast: statements[startNodeIndex + 1] };
     }
+    const overloadRangeToMove = getOverloadRangeToMove(file, startStatement);
+    if (overloadRangeToMove) {
+      return overloadRangeToMove;
+    }
     if (range.pos > startStatement.getStart(file))
       return void 0;
     const afterEndNodeIndex = findIndex(statements, (s) => s.end > range.end, startNodeIndex);
@@ -135720,6 +135729,19 @@ ${lanes.join("\n")}
         return false;
     }
   }
+  function getOverloadRangeToMove(sourceFile, statement) {
+    if (isFunctionLikeDeclaration(statement)) {
+      const declarations = statement.symbol.declarations;
+      if (declarations === void 0 || length(declarations) <= 1 || !contains(declarations, statement)) {
+        return void 0;
+      }
+      const lastDecl = declarations[length(declarations) - 1];
+      const statementsToMove = mapDefined(declarations, (d) => getSourceFileOfNode(d) === sourceFile && isStatement(d) ? d : void 0);
+      const end = findLastIndex(sourceFile.statements, (s) => s.end > lastDecl.end);
+      return { toMove: statementsToMove, afterLast: end >= 0 ? sourceFile.statements[end] : void 0 };
+    }
+    return void 0;
+  }
   var refactorNameForMoveToFile, description2, moveToFileAction;
   var init_moveToFile = __esm({
     "src/services/refactors/moveToFile.ts"() {
@@ -135974,7 +135996,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       init_ts4();
       init_ts_refactor();
       refactorName5 = "Convert overload list to single signature";
-      refactorDescription = Diagnostics.Convert_overload_list_to_single_signature.message;
+      refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_overload_list_to_single_signature);
       functionOverloadAction = {
         name: refactorName5,
         description: refactorDescription,
@@ -136104,15 +136126,15 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       init_ts4();
       init_ts_refactor();
       refactorName6 = "Add or remove braces in an arrow function";
-      refactorDescription2 = Diagnostics.Add_or_remove_braces_in_an_arrow_function.message;
+      refactorDescription2 = getLocaleSpecificMessage(Diagnostics.Add_or_remove_braces_in_an_arrow_function);
       addBracesAction = {
         name: "Add braces to arrow function",
-        description: Diagnostics.Add_braces_to_arrow_function.message,
+        description: getLocaleSpecificMessage(Diagnostics.Add_braces_to_arrow_function),
         kind: "refactor.rewrite.arrow.braces.add"
       };
       removeBracesAction = {
         name: "Remove braces from arrow function",
-        description: Diagnostics.Remove_braces_from_arrow_function.message,
+        description: getLocaleSpecificMessage(Diagnostics.Remove_braces_from_arrow_function),
         kind: "refactor.rewrite.arrow.braces.remove"
       };
       registerRefactor(refactorName6, {
@@ -136983,7 +137005,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
   }
   function isNotEqualsOperator(node) {
-    return node.operatorToken.kind !== 64 /* EqualsToken */;
+    return !(node.operatorToken.kind === 64 /* EqualsToken */ || node.operatorToken.kind === 65 /* PlusEqualsToken */);
   }
   function getParentBinaryExpression(expr) {
     const container = findAncestor(expr.parent, (n) => {
@@ -139018,7 +139040,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       init_ts4();
       init_ts_refactor();
       actionName = "Generate 'get' and 'set' accessors";
-      actionDescription = Diagnostics.Generate_get_and_set_accessors.message;
+      actionDescription = getLocaleSpecificMessage(Diagnostics.Generate_get_and_set_accessors);
       generateGetSetAction = {
         name: actionName,
         description: actionDescription,
@@ -139170,7 +139192,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       init_ts4();
       init_ts_refactor();
       refactorName12 = "Infer function return type";
-      refactorDescription6 = Diagnostics.Infer_function_return_type.message;
+      refactorDescription6 = getLocaleSpecificMessage(Diagnostics.Infer_function_return_type);
       inferReturnTypeAction = {
         name: refactorName12,
         description: refactorDescription6,
@@ -139841,7 +139863,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         onUnRecoverableConfigFileDiagnostic: noop
       };
       const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
+      let releasedScriptKinds = /* @__PURE__ */ new Set();
       if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+        compilerHost = void 0;
+        parsedCommandLines = void 0;
+        releasedScriptKinds = void 0;
         return;
       }
       const options = {
@@ -139854,6 +139880,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       program = createProgram(options);
       compilerHost = void 0;
       parsedCommandLines = void 0;
+      releasedScriptKinds = void 0;
       sourceMapper.clearCache();
       program.getTypeChecker();
       return;
@@ -139908,10 +139935,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         if (!shouldCreateNewSourceFile) {
           const oldSourceFile = program && program.getSourceFileByPath(path);
           if (oldSourceFile) {
-            if (scriptKind === oldSourceFile.scriptKind) {
+            if (scriptKind === oldSourceFile.scriptKind || releasedScriptKinds.has(oldSourceFile.resolvedPath)) {
               return documentRegistry.updateDocumentWithKey(fileName, path, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions);
             } else {
               documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat);
+              releasedScriptKinds.add(oldSourceFile.resolvedPath);
             }
           }
         }
@@ -149207,9 +149235,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     if (call === void 0) {
       return void 0;
     }
-    if (isPrivateIdentifier(token)) {
-      return void 0;
-    }
     const methodName = token.text;
     const addMethodDeclarationChanges = (modifierFlags2) => ts_textChanges_exports.ChangeTracker.with(context, (t) => addMethodDeclaration(context, t, call, token, modifierFlags2, parentDeclaration, declSourceFile));
     const actions2 = [createCodeFixAction(fixMissingMember, addMethodDeclarationChanges(modifierFlags & 32 /* Static */), [modifierFlags & 32 /* Static */ ? Diagnostics.Declare_static_method_0 : Diagnostics.Declare_method_0, methodName], fixMissingMember, Diagnostics.Add_all_missing_members)];
@@ -152546,6 +152571,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           type === void 0 ? factory.createKeywordTypeNode(159 /* UnknownKeyword */) : type
         );
       case 261 /* FunctionDeclaration */:
+        Debug.assert(typeof name === "string" || isIdentifier(name), "Unexpected name");
         return factory.createFunctionDeclaration(
           modifiers,
           asteriskToken,
@@ -160831,9 +160857,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           if (refNode.parent.kind === 303 /* ShorthandPropertyAssignment */) {
             getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference2);
           }
-          const containingClass = getContainingClassIfInHeritageClause(refNode);
-          if (containingClass) {
-            addReference2(containingClass);
+          const containingNode = getContainingNodeIfInHeritageClause(refNode);
+          if (containingNode) {
+            addReference2(containingNode);
             return;
           }
           const typeNode = findAncestor(refNode, (a) => !isQualifiedName(a.parent) && !isTypeNode(a.parent) && !isTypeElement(a.parent));
@@ -160860,8 +160886,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
               addReference2(e);
           }
         }
-        function getContainingClassIfInHeritageClause(node) {
-          return isIdentifier(node) || isPropertyAccessExpression(node) ? getContainingClassIfInHeritageClause(node.parent) : isExpressionWithTypeArguments(node) ? tryCast(node.parent.parent, isClassLike) : void 0;
+        function getContainingNodeIfInHeritageClause(node) {
+          return isIdentifier(node) || isPropertyAccessExpression(node) ? getContainingNodeIfInHeritageClause(node.parent) : isExpressionWithTypeArguments(node) ? tryCast(node.parent.parent, or(isClassLike, isInterfaceDeclaration)) : void 0;
         }
         function isImplementationExpression(node) {
           switch (node.kind) {
@@ -162373,7 +162399,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const tags = (parameters ? parameterDocComments(parameters || [], isJavaScriptFile, indentationStr, newLine) : "") + (hasReturn2 ? returnsDocComment(indentationStr, newLine) : "");
     const openComment = "/**";
     const closeComment = " */";
-    const hasTag = (commentOwnerJsDoc || []).some((jsDoc) => !!jsDoc.tags);
+    const hasTag = length(getJSDocTags(commentOwner)) > 0;
     if (tags && !hasTag) {
       const preamble = openComment + newLine + indentationStr + " * ";
       const endLine = tokenStart === position ? newLine + indentationStr : "";
@@ -167937,7 +167963,8 @@ ${options.prefix}` : "\n" : options.prefix
       }
       processNode(enclosingNode, enclosingNode, startLine, undecoratedStartLine, initialIndentation, delta);
     }
-    if (!formattingScanner.isOnToken()) {
+    const remainingTrivia = formattingScanner.getCurrentLeadingTrivia();
+    if (remainingTrivia) {
       const indentation = SmartIndenter.nodeWillIndentChild(
         options,
         enclosingNode,
@@ -167947,25 +167974,30 @@ ${options.prefix}` : "\n" : options.prefix
         /*indentByDefault*/
         false
       ) ? initialIndentation + options.indentSize : initialIndentation;
-      const leadingTrivia = formattingScanner.getCurrentLeadingTrivia();
-      if (leadingTrivia) {
-        indentTriviaItems(
-          leadingTrivia,
-          indentation,
-          /*indentNextTokenOrTrivia*/
-          false,
-          (item) => processRange(
+      indentTriviaItems(
+        remainingTrivia,
+        indentation,
+        /*indentNextTokenOrTrivia*/
+        true,
+        (item) => {
+          processRange(
             item,
             sourceFile.getLineAndCharacterOfPosition(item.pos),
             enclosingNode,
             enclosingNode,
             /*dynamicIndentation*/
             void 0
-          )
-        );
-        if (options.trimTrailingWhitespace !== false) {
-          trimTrailingWhitespacesForRemainingRange(leadingTrivia);
+          );
+          insertIndentation(
+            item.pos,
+            indentation,
+            /*lineAdded*/
+            false
+          );
         }
+      );
+      if (options.trimTrailingWhitespace !== false) {
+        trimTrailingWhitespacesForRemainingRange(remainingTrivia);
       }
     }
     if (previousRange && formattingScanner.getTokenFullStart() >= originalRange.end) {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230524`;
+      version = `${versionMajorMinor}.0-insiders.20230526`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -60969,6 +60969,10 @@ ${lanes.join("\n")}
         return true;
       }
       switch (node.kind) {
+        case 233 /* AsExpression */:
+          if (!isConstAssertion(node)) {
+            break;
+          }
         case 293 /* JsxExpression */:
         case 216 /* ParenthesizedExpression */:
           return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
@@ -64216,7 +64220,7 @@ ${lanes.join("\n")}
           }
         }
       }
-      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i]), 0 /* None */) : target;
       return filtered.flags & 131072 /* Never */ ? target : filtered;
     }
     function isWeakType(type) {
@@ -65195,8 +65199,6 @@ ${lanes.join("\n")}
       return context && context.mapper;
     }
     function couldContainTypeVariables(type) {
-      if (type.flags & 67359327 /* Intrinsic */)
-        return false;
       const objectFlags = getObjectFlags(type);
       if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
         return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
@@ -67249,7 +67251,7 @@ ${lanes.join("\n")}
             target.antecedents = saveAntecedents;
           } else if (flags & 2 /* Start */) {
             const container = flow.node;
-            if (container && container !== flowContainer && reference.kind !== 210 /* PropertyAccessExpression */ && reference.kind !== 211 /* ElementAccessExpression */ && reference.kind !== 110 /* ThisKeyword */) {
+            if (container && container !== flowContainer && reference.kind !== 210 /* PropertyAccessExpression */ && reference.kind !== 211 /* ElementAccessExpression */ && !(reference.kind === 110 /* ThisKeyword */ && container.kind !== 218 /* ArrowFunction */)) {
               flow = container.flowNode;
               continue;
             }
@@ -75736,7 +75738,7 @@ ${lanes.join("\n")}
           Debug.assertIsDefined(leftType);
           const rightType = getLastResult(state);
           Debug.assertIsDefined(rightType);
-          result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, node);
+          result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, state.checkMode, node);
         }
         state.skip = false;
         setLeftType(
@@ -75798,9 +75800,9 @@ ${lanes.join("\n")}
         leftType = checkExpression(left, checkMode);
       }
       const rightType = checkExpression(right, checkMode);
-      return checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, errorNode);
+      return checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, checkMode, errorNode);
     }
-    function checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, errorNode) {
+    function checkBinaryLikeExpressionWorker(left, operatorToken, right, leftType, rightType, checkMode, errorNode) {
       const operator = operatorToken.kind;
       switch (operator) {
         case 42 /* AsteriskToken */:
@@ -75957,12 +75959,14 @@ ${lanes.join("\n")}
         case 36 /* ExclamationEqualsToken */:
         case 37 /* EqualsEqualsEqualsToken */:
         case 38 /* ExclamationEqualsEqualsToken */:
-          if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
-            const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
-            error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
+          if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+            if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
+              const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
+              error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
+            }
+            checkNaNEquality(errorNode, operator, left, right);
+            reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
           }
-          checkNaNEquality(errorNode, operator, left, right);
-          reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
           return booleanType;
         case 104 /* InstanceOfKeyword */:
           return checkInstanceOfExpression(left, right, leftType, rightType);
@@ -76273,7 +76277,7 @@ ${lanes.join("\n")}
       }
     }
     function checkConditionalExpression(node, checkMode) {
-      const type = checkTruthinessExpression(node.condition);
+      const type = checkTruthinessExpression(node.condition, checkMode);
       checkTestingKnownTruthyCallableOrAwaitableType(node.condition, type, node.whenTrue);
       const type1 = checkExpression(node.whenTrue, checkMode);
       const type2 = checkExpression(node.whenFalse, checkMode);
@@ -76614,7 +76618,7 @@ ${lanes.join("\n")}
         }
       }
       const startInvocationCount = flowInvocationCount;
-      const type = checkExpression(node);
+      const type = checkExpression(node, 128 /* TypeOnly */);
       if (flowInvocationCount !== startInvocationCount) {
         const cache = flowTypeCache || (flowTypeCache = []);
         cache[getNodeId(node)] = type;
@@ -85824,6 +85828,7 @@ ${lanes.join("\n")}
         CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
         CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
+        CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
         return CheckMode3;
       })(CheckMode || {});
       SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -134203,12 +134208,12 @@ ${lanes.join("\n")}
       refactorName = "Convert export";
       defaultToNamedAction = {
         name: "Convert default export to named export",
-        description: Diagnostics.Convert_default_export_to_named_export.message,
+        description: getLocaleSpecificMessage(Diagnostics.Convert_default_export_to_named_export),
         kind: "refactor.rewrite.export.named"
       };
       namedToDefaultAction = {
         name: "Convert named export to default export",
-        description: Diagnostics.Convert_named_export_to_default_export.message,
+        description: getLocaleSpecificMessage(Diagnostics.Convert_named_export_to_default_export),
         kind: "refactor.rewrite.export.default"
       };
       registerRefactor(refactorName, {
@@ -134226,7 +134231,7 @@ ${lanes.join("\n")}
           }
           if (context.preferences.provideRefactorNotApplicableReason) {
             return [
-              { name: refactorName, description: Diagnostics.Convert_default_export_to_named_export.message, actions: [
+              { name: refactorName, description: getLocaleSpecificMessage(Diagnostics.Convert_default_export_to_named_export), actions: [
                 { ...defaultToNamedAction, notApplicableReason: info.error },
                 { ...namedToDefaultAction, notApplicableReason: info.error }
               ] }
@@ -134428,17 +134433,17 @@ ${lanes.join("\n")}
       actions = {
         [0 /* Named */]: {
           name: "Convert namespace import to named imports",
-          description: Diagnostics.Convert_namespace_import_to_named_imports.message,
+          description: getLocaleSpecificMessage(Diagnostics.Convert_namespace_import_to_named_imports),
           kind: "refactor.rewrite.import.named"
         },
         [2 /* Namespace */]: {
           name: "Convert named imports to namespace import",
-          description: Diagnostics.Convert_named_imports_to_namespace_import.message,
+          description: getLocaleSpecificMessage(Diagnostics.Convert_named_imports_to_namespace_import),
           kind: "refactor.rewrite.import.namespace"
         },
         [1 /* Default */]: {
           name: "Convert named imports to default import",
-          description: Diagnostics.Convert_named_imports_to_default_import.message,
+          description: getLocaleSpecificMessage(Diagnostics.Convert_named_imports_to_default_import),
           kind: "refactor.rewrite.import.default"
         }
       };
@@ -135540,6 +135545,10 @@ ${lanes.join("\n")}
     if (isNamedDeclaration(startStatement) && startStatement.name && rangeContainsRange(startStatement.name, range)) {
       return { toMove: [statements[startNodeIndex]], afterLast: statements[startNodeIndex + 1] };
     }
+    const overloadRangeToMove = getOverloadRangeToMove(file, startStatement);
+    if (overloadRangeToMove) {
+      return overloadRangeToMove;
+    }
     if (range.pos > startStatement.getStart(file))
       return void 0;
     const afterEndNodeIndex = findIndex(statements, (s) => s.end > range.end, startNodeIndex);
@@ -135735,6 +135744,19 @@ ${lanes.join("\n")}
         return false;
     }
   }
+  function getOverloadRangeToMove(sourceFile, statement) {
+    if (isFunctionLikeDeclaration(statement)) {
+      const declarations = statement.symbol.declarations;
+      if (declarations === void 0 || length(declarations) <= 1 || !contains(declarations, statement)) {
+        return void 0;
+      }
+      const lastDecl = declarations[length(declarations) - 1];
+      const statementsToMove = mapDefined(declarations, (d) => getSourceFileOfNode(d) === sourceFile && isStatement(d) ? d : void 0);
+      const end = findLastIndex(sourceFile.statements, (s) => s.end > lastDecl.end);
+      return { toMove: statementsToMove, afterLast: end >= 0 ? sourceFile.statements[end] : void 0 };
+    }
+    return void 0;
+  }
   var refactorNameForMoveToFile, description2, moveToFileAction;
   var init_moveToFile = __esm({
     "src/services/refactors/moveToFile.ts"() {
@@ -135989,7 +136011,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       init_ts4();
       init_ts_refactor();
       refactorName5 = "Convert overload list to single signature";
-      refactorDescription = Diagnostics.Convert_overload_list_to_single_signature.message;
+      refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_overload_list_to_single_signature);
       functionOverloadAction = {
         name: refactorName5,
         description: refactorDescription,
@@ -136119,15 +136141,15 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       init_ts4();
       init_ts_refactor();
       refactorName6 = "Add or remove braces in an arrow function";
-      refactorDescription2 = Diagnostics.Add_or_remove_braces_in_an_arrow_function.message;
+      refactorDescription2 = getLocaleSpecificMessage(Diagnostics.Add_or_remove_braces_in_an_arrow_function);
       addBracesAction = {
         name: "Add braces to arrow function",
-        description: Diagnostics.Add_braces_to_arrow_function.message,
+        description: getLocaleSpecificMessage(Diagnostics.Add_braces_to_arrow_function),
         kind: "refactor.rewrite.arrow.braces.add"
       };
       removeBracesAction = {
         name: "Remove braces from arrow function",
-        description: Diagnostics.Remove_braces_from_arrow_function.message,
+        description: getLocaleSpecificMessage(Diagnostics.Remove_braces_from_arrow_function),
         kind: "refactor.rewrite.arrow.braces.remove"
       };
       registerRefactor(refactorName6, {
@@ -136998,7 +137020,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
   }
   function isNotEqualsOperator(node) {
-    return node.operatorToken.kind !== 64 /* EqualsToken */;
+    return !(node.operatorToken.kind === 64 /* EqualsToken */ || node.operatorToken.kind === 65 /* PlusEqualsToken */);
   }
   function getParentBinaryExpression(expr) {
     const container = findAncestor(expr.parent, (n) => {
@@ -139033,7 +139055,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       init_ts4();
       init_ts_refactor();
       actionName = "Generate 'get' and 'set' accessors";
-      actionDescription = Diagnostics.Generate_get_and_set_accessors.message;
+      actionDescription = getLocaleSpecificMessage(Diagnostics.Generate_get_and_set_accessors);
       generateGetSetAction = {
         name: actionName,
         description: actionDescription,
@@ -139185,7 +139207,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       init_ts4();
       init_ts_refactor();
       refactorName12 = "Infer function return type";
-      refactorDescription6 = Diagnostics.Infer_function_return_type.message;
+      refactorDescription6 = getLocaleSpecificMessage(Diagnostics.Infer_function_return_type);
       inferReturnTypeAction = {
         name: refactorName12,
         description: refactorDescription6,
@@ -139856,7 +139878,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         onUnRecoverableConfigFileDiagnostic: noop
       };
       const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
+      let releasedScriptKinds = /* @__PURE__ */ new Set();
       if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+        compilerHost = void 0;
+        parsedCommandLines = void 0;
+        releasedScriptKinds = void 0;
         return;
       }
       const options = {
@@ -139869,6 +139895,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       program = createProgram(options);
       compilerHost = void 0;
       parsedCommandLines = void 0;
+      releasedScriptKinds = void 0;
       sourceMapper.clearCache();
       program.getTypeChecker();
       return;
@@ -139923,10 +139950,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         if (!shouldCreateNewSourceFile) {
           const oldSourceFile = program && program.getSourceFileByPath(path);
           if (oldSourceFile) {
-            if (scriptKind === oldSourceFile.scriptKind) {
+            if (scriptKind === oldSourceFile.scriptKind || releasedScriptKinds.has(oldSourceFile.resolvedPath)) {
               return documentRegistry.updateDocumentWithKey(fileName, path, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions);
             } else {
               documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat);
+              releasedScriptKinds.add(oldSourceFile.resolvedPath);
             }
           }
         }
@@ -149222,9 +149250,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     if (call === void 0) {
       return void 0;
     }
-    if (isPrivateIdentifier(token)) {
-      return void 0;
-    }
     const methodName = token.text;
     const addMethodDeclarationChanges = (modifierFlags2) => ts_textChanges_exports.ChangeTracker.with(context, (t) => addMethodDeclaration(context, t, call, token, modifierFlags2, parentDeclaration, declSourceFile));
     const actions2 = [createCodeFixAction(fixMissingMember, addMethodDeclarationChanges(modifierFlags & 32 /* Static */), [modifierFlags & 32 /* Static */ ? Diagnostics.Declare_static_method_0 : Diagnostics.Declare_method_0, methodName], fixMissingMember, Diagnostics.Add_all_missing_members)];
@@ -152561,6 +152586,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           type === void 0 ? factory.createKeywordTypeNode(159 /* UnknownKeyword */) : type
         );
       case 261 /* FunctionDeclaration */:
+        Debug.assert(typeof name === "string" || isIdentifier(name), "Unexpected name");
         return factory.createFunctionDeclaration(
           modifiers,
           asteriskToken,
@@ -160846,9 +160872,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           if (refNode.parent.kind === 303 /* ShorthandPropertyAssignment */) {
             getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference2);
           }
-          const containingClass = getContainingClassIfInHeritageClause(refNode);
-          if (containingClass) {
-            addReference2(containingClass);
+          const containingNode = getContainingNodeIfInHeritageClause(refNode);
+          if (containingNode) {
+            addReference2(containingNode);
             return;
           }
           const typeNode = findAncestor(refNode, (a) => !isQualifiedName(a.parent) && !isTypeNode(a.parent) && !isTypeElement(a.parent));
@@ -160875,8 +160901,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
               addReference2(e);
           }
         }
-        function getContainingClassIfInHeritageClause(node) {
-          return isIdentifier(node) || isPropertyAccessExpression(node) ? getContainingClassIfInHeritageClause(node.parent) : isExpressionWithTypeArguments(node) ? tryCast(node.parent.parent, isClassLike) : void 0;
+        function getContainingNodeIfInHeritageClause(node) {
+          return isIdentifier(node) || isPropertyAccessExpression(node) ? getContainingNodeIfInHeritageClause(node.parent) : isExpressionWithTypeArguments(node) ? tryCast(node.parent.parent, or(isClassLike, isInterfaceDeclaration)) : void 0;
         }
         function isImplementationExpression(node) {
           switch (node.kind) {
@@ -162388,7 +162414,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const tags = (parameters ? parameterDocComments(parameters || [], isJavaScriptFile, indentationStr, newLine) : "") + (hasReturn2 ? returnsDocComment(indentationStr, newLine) : "");
     const openComment = "/**";
     const closeComment = " */";
-    const hasTag = (commentOwnerJsDoc || []).some((jsDoc) => !!jsDoc.tags);
+    const hasTag = length(getJSDocTags(commentOwner)) > 0;
     if (tags && !hasTag) {
       const preamble = openComment + newLine + indentationStr + " * ";
       const endLine = tokenStart === position ? newLine + indentationStr : "";
@@ -167952,7 +167978,8 @@ ${options.prefix}` : "\n" : options.prefix
       }
       processNode(enclosingNode, enclosingNode, startLine, undecoratedStartLine, initialIndentation, delta);
     }
-    if (!formattingScanner.isOnToken()) {
+    const remainingTrivia = formattingScanner.getCurrentLeadingTrivia();
+    if (remainingTrivia) {
       const indentation = SmartIndenter.nodeWillIndentChild(
         options,
         enclosingNode,
@@ -167962,25 +167989,30 @@ ${options.prefix}` : "\n" : options.prefix
         /*indentByDefault*/
         false
       ) ? initialIndentation + options.indentSize : initialIndentation;
-      const leadingTrivia = formattingScanner.getCurrentLeadingTrivia();
-      if (leadingTrivia) {
-        indentTriviaItems(
-          leadingTrivia,
-          indentation,
-          /*indentNextTokenOrTrivia*/
-          false,
-          (item) => processRange(
+      indentTriviaItems(
+        remainingTrivia,
+        indentation,
+        /*indentNextTokenOrTrivia*/
+        true,
+        (item) => {
+          processRange(
             item,
             sourceFile.getLineAndCharacterOfPosition(item.pos),
             enclosingNode,
             enclosingNode,
             /*dynamicIndentation*/
             void 0
-          )
-        );
-        if (options.trimTrailingWhitespace !== false) {
-          trimTrailingWhitespacesForRemainingRange(leadingTrivia);
+          );
+          insertIndentation(
+            item.pos,
+            indentation,
+            /*lineAdded*/
+            false
+          );
         }
+      );
+      if (options.trimTrailingWhitespace !== false) {
+        trimTrailingWhitespacesForRemainingRange(remainingTrivia);
       }
     }
     if (previousRange && formattingScanner.getTokenFullStart() >= originalRange.end) {

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.20230524`;
+var version = `${versionMajorMinor}.0-insiders.20230526`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -28916,6 +28916,7 @@ var CheckMode = /* @__PURE__ */ ((CheckMode3) => {
   CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
   CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
   CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
+  CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
   return CheckMode3;
 })(CheckMode || {});
 var SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {

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-54377-7",
+  "version": "5.2.0-pr-54052-23",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "d72224104a48673dadda349d19e7974c5d979205"
+  "gitHead": "173034c4007a3992ea049b4f13cd7b44f9217679"
 }