typescript 5.2.0-dev.20230523 → 5.2.0-dev.20230526

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-dev.20230523`;
+var version = `${versionMajorMinor}.0-dev.20230526`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -47902,32 +47902,34 @@ function createTypeChecker(host) {
           const methodDeclaration = signatureToSignatureDeclarationHelper(signature, 172 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
           typeElements.push(preserveCommentsOn(methodDeclaration));
         }
+        if (signatures.length || !optionalToken) {
+          return;
+        }
+      }
+      let propertyTypeNode;
+      if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
+        propertyTypeNode = createElidedInformationPlaceholder(context);
       } else {
-        let propertyTypeNode;
-        if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
-          propertyTypeNode = createElidedInformationPlaceholder(context);
-        } else {
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack || (context.reverseMappedStack = []);
-            context.reverseMappedStack.push(propertySymbol);
-          }
-          propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack.pop();
-          }
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack || (context.reverseMappedStack = []);
+          context.reverseMappedStack.push(propertySymbol);
         }
-        const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
-        if (modifiers) {
-          context.approximateLength += 9;
+        propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack.pop();
         }
-        const propertySignature = factory.createPropertySignature(
-          modifiers,
-          propertyName,
-          optionalToken,
-          propertyTypeNode
-        );
-        typeElements.push(preserveCommentsOn(propertySignature));
       }
+      const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
+      if (modifiers) {
+        context.approximateLength += 9;
+      }
+      const propertySignature = factory.createPropertySignature(
+        modifiers,
+        propertyName,
+        optionalToken,
+        propertyTypeNode
+      );
+      typeElements.push(preserveCommentsOn(propertySignature));
       function preserveCommentsOn(node) {
         var _a2;
         if (some(propertySymbol.declarations, (d) => d.kind === 354 /* JSDocPropertyTag */)) {
@@ -57280,9 +57282,9 @@ function createTypeChecker(host) {
         );
         if (freshMapper) {
           const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (const p of freshParams) {
-            if (root.inferTypeParameters.indexOf(p) === -1) {
-              p.mapper = freshCombinedMapper;
+          for (let i = 0; i < freshParams.length; i++) {
+            if (freshParams[i] !== root.inferTypeParameters[i]) {
+              freshParams[i].mapper = freshCombinedMapper;
             }
           }
         }
@@ -58185,6 +58187,9 @@ function createTypeChecker(host) {
     const elementFlags = tupleType.target.elementFlags;
     const elementTypes = map(getElementTypes(tupleType), (t, i) => {
       const singleton = elementFlags[i] & 8 /* Variadic */ ? t : elementFlags[i] & 4 /* Rest */ ? createArrayType(t) : createTupleType([t], [elementFlags[i]]);
+      if (singleton === typeVariable) {
+        return mappedType;
+      }
       return instantiateMappedType(mappedType, prependTypeMapping(typeVariable, singleton, mapper));
     });
     const newReadonly = getModifiedReadonlyState(tupleType.target.readonly, getMappedTypeModifiers(mappedType));
@@ -64800,7 +64805,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;
           }
@@ -74241,7 +74246,7 @@ function createTypeChecker(host) {
     if (getIsolatedModules(compilerOptions)) {
       Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
       const constEnumDeclaration = type.symbol.valueDeclaration;
-      if (constEnumDeclaration.flags & 16777216 /* Ambient */) {
+      if (constEnumDeclaration.flags & 16777216 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
         error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
       }
     }

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-dev.20230523`;
+var version = `${versionMajorMinor}.0-dev.20230526`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -52553,32 +52553,34 @@ function createTypeChecker(host) {
           const methodDeclaration = signatureToSignatureDeclarationHelper(signature, 172 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
           typeElements.push(preserveCommentsOn(methodDeclaration));
         }
+        if (signatures.length || !optionalToken) {
+          return;
+        }
+      }
+      let propertyTypeNode;
+      if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
+        propertyTypeNode = createElidedInformationPlaceholder(context);
       } else {
-        let propertyTypeNode;
-        if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
-          propertyTypeNode = createElidedInformationPlaceholder(context);
-        } else {
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack || (context.reverseMappedStack = []);
-            context.reverseMappedStack.push(propertySymbol);
-          }
-          propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack.pop();
-          }
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack || (context.reverseMappedStack = []);
+          context.reverseMappedStack.push(propertySymbol);
         }
-        const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
-        if (modifiers) {
-          context.approximateLength += 9;
+        propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack.pop();
         }
-        const propertySignature = factory.createPropertySignature(
-          modifiers,
-          propertyName,
-          optionalToken,
-          propertyTypeNode
-        );
-        typeElements.push(preserveCommentsOn(propertySignature));
       }
+      const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
+      if (modifiers) {
+        context.approximateLength += 9;
+      }
+      const propertySignature = factory.createPropertySignature(
+        modifiers,
+        propertyName,
+        optionalToken,
+        propertyTypeNode
+      );
+      typeElements.push(preserveCommentsOn(propertySignature));
       function preserveCommentsOn(node) {
         var _a2;
         if (some(propertySymbol.declarations, (d) => d.kind === 354 /* JSDocPropertyTag */)) {
@@ -61931,9 +61933,9 @@ function createTypeChecker(host) {
         );
         if (freshMapper) {
           const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (const p of freshParams) {
-            if (root.inferTypeParameters.indexOf(p) === -1) {
-              p.mapper = freshCombinedMapper;
+          for (let i = 0; i < freshParams.length; i++) {
+            if (freshParams[i] !== root.inferTypeParameters[i]) {
+              freshParams[i].mapper = freshCombinedMapper;
             }
           }
         }
@@ -62836,6 +62838,9 @@ function createTypeChecker(host) {
     const elementFlags = tupleType.target.elementFlags;
     const elementTypes = map(getElementTypes(tupleType), (t, i) => {
       const singleton = elementFlags[i] & 8 /* Variadic */ ? t : elementFlags[i] & 4 /* Rest */ ? createArrayType(t) : createTupleType([t], [elementFlags[i]]);
+      if (singleton === typeVariable) {
+        return mappedType;
+      }
       return instantiateMappedType(mappedType, prependTypeMapping(typeVariable, singleton, mapper));
     });
     const newReadonly = getModifiedReadonlyState(tupleType.target.readonly, getMappedTypeModifiers(mappedType));
@@ -69451,7 +69456,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;
           }
@@ -78892,7 +78897,7 @@ function createTypeChecker(host) {
     if (getIsolatedModules(compilerOptions)) {
       Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
       const constEnumDeclaration = type.symbol.valueDeclaration;
-      if (constEnumDeclaration.flags & 16777216 /* Ambient */) {
+      if (constEnumDeclaration.flags & 16777216 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
         error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
       }
     }
@@ -136506,10 +136511,9 @@ registerRefactor(refactorNameForMoveToFile, {
   }
 });
 function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
-  var _a;
   const checker = program.getTypeChecker();
   const usage = getUsageInfo(oldFile, toMove.all, checker);
-  if (!host.fileExists(targetFile) || host.fileExists(targetFile) && ((_a = program.getSourceFile(targetFile)) == null ? void 0 : _a.statements.length) === 0) {
+  if (!host.fileExists(targetFile)) {
     changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
     addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
   } else {
@@ -136547,6 +136551,13 @@ function getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, chang
   if (typeof targetFile !== "string") {
     if (targetFile.statements.length > 0) {
       changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+    } else {
+      changes.insertNodesAtEndOfFile(
+        targetFile,
+        body,
+        /*blankLineBetween*/
+        false
+      );
     }
     if (imports.length > 0) {
       insertImports(
@@ -137133,6 +137144,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);
@@ -137328,6 +137343,19 @@ 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 = {};
@@ -138508,7 +138536,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) => {
@@ -141884,7 +141912,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 = {
@@ -141897,6 +141929,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     program = createProgram(options);
     compilerHost = void 0;
     parsedCommandLines = void 0;
+    releasedScriptKinds = void 0;
     sourceMapper.clearCache();
     program.getTypeChecker();
     return;
@@ -141951,10 +141984,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);
           }
         }
       }
@@ -161507,9 +161541,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));
@@ -161536,8 +161570,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) {
@@ -163088,7 +163122,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 : "";
@@ -166011,6 +166045,17 @@ var ChangeTracker = class {
       this.insertNodeAt(sourceFile, pos, insert, options);
     }
   }
+  insertNodesAtEndOfFile(sourceFile, newNodes, blankLineBetween) {
+    this.insertAtEndOfFile(sourceFile, newNodes, blankLineBetween);
+  }
+  insertAtEndOfFile(sourceFile, insert, blankLineBetween) {
+    const pos = sourceFile.end + 1;
+    const options = {
+      prefix: this.newLineCharacter,
+      suffix: this.newLineCharacter + (blankLineBetween ? this.newLineCharacter : "")
+    };
+    this.insertNodesAt(sourceFile, pos, insert, options);
+  }
   insertStatementsInNewFile(fileName, statements, oldFile) {
     if (!this.newFileChanges) {
       this.newFileChanges = createMultiMap();
@@ -168428,7 +168473,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,
@@ -168438,25 +168484,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.d.ts

@@ -10196,7 +10196,7 @@ declare namespace ts {
          * arguments for any interactive action before offering it.
          */
         getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string, includeInteractiveActions?: boolean): ApplicableRefactorInfo[];
-        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, includeInteractiveActions?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
+        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, interactiveRefactorArguments?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
         getMoveToRefactoringFileSuggestions(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string): {
             newFileName: string;
             files: string[];

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230523`;
+      version = `${versionMajorMinor}.0-dev.20230526`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -50344,32 +50344,34 @@ ${lanes.join("\n")}
             const methodDeclaration = signatureToSignatureDeclarationHelper(signature, 172 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
             typeElements.push(preserveCommentsOn(methodDeclaration));
           }
+          if (signatures.length || !optionalToken) {
+            return;
+          }
+        }
+        let propertyTypeNode;
+        if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
+          propertyTypeNode = createElidedInformationPlaceholder(context);
         } else {
-          let propertyTypeNode;
-          if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
-            propertyTypeNode = createElidedInformationPlaceholder(context);
-          } else {
-            if (propertyIsReverseMapped) {
-              context.reverseMappedStack || (context.reverseMappedStack = []);
-              context.reverseMappedStack.push(propertySymbol);
-            }
-            propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
-            if (propertyIsReverseMapped) {
-              context.reverseMappedStack.pop();
-            }
+          if (propertyIsReverseMapped) {
+            context.reverseMappedStack || (context.reverseMappedStack = []);
+            context.reverseMappedStack.push(propertySymbol);
           }
-          const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
-          if (modifiers) {
-            context.approximateLength += 9;
+          propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
+          if (propertyIsReverseMapped) {
+            context.reverseMappedStack.pop();
           }
-          const propertySignature = factory.createPropertySignature(
-            modifiers,
-            propertyName,
-            optionalToken,
-            propertyTypeNode
-          );
-          typeElements.push(preserveCommentsOn(propertySignature));
         }
+        const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
+        if (modifiers) {
+          context.approximateLength += 9;
+        }
+        const propertySignature = factory.createPropertySignature(
+          modifiers,
+          propertyName,
+          optionalToken,
+          propertyTypeNode
+        );
+        typeElements.push(preserveCommentsOn(propertySignature));
         function preserveCommentsOn(node) {
           var _a2;
           if (some(propertySymbol.declarations, (d) => d.kind === 354 /* JSDocPropertyTag */)) {
@@ -59722,9 +59724,9 @@ ${lanes.join("\n")}
           );
           if (freshMapper) {
             const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-            for (const p of freshParams) {
-              if (root.inferTypeParameters.indexOf(p) === -1) {
-                p.mapper = freshCombinedMapper;
+            for (let i = 0; i < freshParams.length; i++) {
+              if (freshParams[i] !== root.inferTypeParameters[i]) {
+                freshParams[i].mapper = freshCombinedMapper;
               }
             }
           }
@@ -60627,6 +60629,9 @@ ${lanes.join("\n")}
       const elementFlags = tupleType.target.elementFlags;
       const elementTypes = map(getElementTypes(tupleType), (t, i) => {
         const singleton = elementFlags[i] & 8 /* Variadic */ ? t : elementFlags[i] & 4 /* Rest */ ? createArrayType(t) : createTupleType([t], [elementFlags[i]]);
+        if (singleton === typeVariable) {
+          return mappedType;
+        }
         return instantiateMappedType(mappedType, prependTypeMapping(typeVariable, singleton, mapper));
       });
       const newReadonly = getModifiedReadonlyState(tupleType.target.readonly, getMappedTypeModifiers(mappedType));
@@ -67242,7 +67247,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;
             }
@@ -76683,7 +76688,7 @@ ${lanes.join("\n")}
       if (getIsolatedModules(compilerOptions)) {
         Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
         const constEnumDeclaration = type.symbol.valueDeclaration;
-        if (constEnumDeclaration.flags & 16777216 /* Ambient */) {
+        if (constEnumDeclaration.flags & 16777216 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
           error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
         }
       }
@@ -134885,10 +134890,9 @@ ${lanes.join("\n")}
 
   // src/services/refactors/moveToFile.ts
   function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
-    var _a;
     const checker = program.getTypeChecker();
     const usage = getUsageInfo(oldFile, toMove.all, checker);
-    if (!host.fileExists(targetFile) || host.fileExists(targetFile) && ((_a = program.getSourceFile(targetFile)) == null ? void 0 : _a.statements.length) === 0) {
+    if (!host.fileExists(targetFile)) {
       changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
       addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
     } else {
@@ -134926,6 +134930,13 @@ ${lanes.join("\n")}
     if (typeof targetFile !== "string") {
       if (targetFile.statements.length > 0) {
         changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+      } else {
+        changes.insertNodesAtEndOfFile(
+          targetFile,
+          body,
+          /*blankLineBetween*/
+          false
+        );
       }
       if (imports.length > 0) {
         insertImports(
@@ -135512,6 +135523,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);
@@ -135707,6 +135722,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"() {
@@ -136970,7 +136998,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) => {
@@ -139828,7 +139856,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 = {
@@ -139841,6 +139873,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;
@@ -139895,10 +139928,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);
             }
           }
         }
@@ -160818,9 +160852,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));
@@ -160847,8 +160881,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) {
@@ -162360,7 +162394,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 : "";
@@ -165881,6 +165915,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             this.insertNodeAt(sourceFile, pos, insert, options);
           }
         }
+        insertNodesAtEndOfFile(sourceFile, newNodes, blankLineBetween) {
+          this.insertAtEndOfFile(sourceFile, newNodes, blankLineBetween);
+        }
+        insertAtEndOfFile(sourceFile, insert, blankLineBetween) {
+          const pos = sourceFile.end + 1;
+          const options = {
+            prefix: this.newLineCharacter,
+            suffix: this.newLineCharacter + (blankLineBetween ? this.newLineCharacter : "")
+          };
+          this.insertNodesAt(sourceFile, pos, insert, options);
+        }
         insertStatementsInNewFile(fileName, statements, oldFile) {
           if (!this.newFileChanges) {
             this.newFileChanges = createMultiMap();
@@ -167913,7 +167958,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,
@@ -167923,25 +167969,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.d.ts

@@ -6227,7 +6227,7 @@ declare namespace ts {
          * arguments for any interactive action before offering it.
          */
         getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string, includeInteractiveActions?: boolean): ApplicableRefactorInfo[];
-        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, includeInteractiveActions?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
+        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, interactiveRefactorArguments?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
         getMoveToRefactoringFileSuggestions(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string): {
             newFileName: string;
             files: string[];

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230523`;
+      version = `${versionMajorMinor}.0-dev.20230526`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -50344,32 +50344,34 @@ ${lanes.join("\n")}
             const methodDeclaration = signatureToSignatureDeclarationHelper(signature, 172 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
             typeElements.push(preserveCommentsOn(methodDeclaration));
           }
+          if (signatures.length || !optionalToken) {
+            return;
+          }
+        }
+        let propertyTypeNode;
+        if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
+          propertyTypeNode = createElidedInformationPlaceholder(context);
         } else {
-          let propertyTypeNode;
-          if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
-            propertyTypeNode = createElidedInformationPlaceholder(context);
-          } else {
-            if (propertyIsReverseMapped) {
-              context.reverseMappedStack || (context.reverseMappedStack = []);
-              context.reverseMappedStack.push(propertySymbol);
-            }
-            propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
-            if (propertyIsReverseMapped) {
-              context.reverseMappedStack.pop();
-            }
+          if (propertyIsReverseMapped) {
+            context.reverseMappedStack || (context.reverseMappedStack = []);
+            context.reverseMappedStack.push(propertySymbol);
           }
-          const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
-          if (modifiers) {
-            context.approximateLength += 9;
+          propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
+          if (propertyIsReverseMapped) {
+            context.reverseMappedStack.pop();
           }
-          const propertySignature = factory.createPropertySignature(
-            modifiers,
-            propertyName,
-            optionalToken,
-            propertyTypeNode
-          );
-          typeElements.push(preserveCommentsOn(propertySignature));
         }
+        const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
+        if (modifiers) {
+          context.approximateLength += 9;
+        }
+        const propertySignature = factory.createPropertySignature(
+          modifiers,
+          propertyName,
+          optionalToken,
+          propertyTypeNode
+        );
+        typeElements.push(preserveCommentsOn(propertySignature));
         function preserveCommentsOn(node) {
           var _a2;
           if (some(propertySymbol.declarations, (d) => d.kind === 354 /* JSDocPropertyTag */)) {
@@ -59722,9 +59724,9 @@ ${lanes.join("\n")}
           );
           if (freshMapper) {
             const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-            for (const p of freshParams) {
-              if (root.inferTypeParameters.indexOf(p) === -1) {
-                p.mapper = freshCombinedMapper;
+            for (let i = 0; i < freshParams.length; i++) {
+              if (freshParams[i] !== root.inferTypeParameters[i]) {
+                freshParams[i].mapper = freshCombinedMapper;
               }
             }
           }
@@ -60627,6 +60629,9 @@ ${lanes.join("\n")}
       const elementFlags = tupleType.target.elementFlags;
       const elementTypes = map(getElementTypes(tupleType), (t, i) => {
         const singleton = elementFlags[i] & 8 /* Variadic */ ? t : elementFlags[i] & 4 /* Rest */ ? createArrayType(t) : createTupleType([t], [elementFlags[i]]);
+        if (singleton === typeVariable) {
+          return mappedType;
+        }
         return instantiateMappedType(mappedType, prependTypeMapping(typeVariable, singleton, mapper));
       });
       const newReadonly = getModifiedReadonlyState(tupleType.target.readonly, getMappedTypeModifiers(mappedType));
@@ -67242,7 +67247,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;
             }
@@ -76683,7 +76688,7 @@ ${lanes.join("\n")}
       if (getIsolatedModules(compilerOptions)) {
         Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
         const constEnumDeclaration = type.symbol.valueDeclaration;
-        if (constEnumDeclaration.flags & 16777216 /* Ambient */) {
+        if (constEnumDeclaration.flags & 16777216 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
           error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
         }
       }
@@ -134900,10 +134905,9 @@ ${lanes.join("\n")}
 
   // src/services/refactors/moveToFile.ts
   function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
-    var _a;
     const checker = program.getTypeChecker();
     const usage = getUsageInfo(oldFile, toMove.all, checker);
-    if (!host.fileExists(targetFile) || host.fileExists(targetFile) && ((_a = program.getSourceFile(targetFile)) == null ? void 0 : _a.statements.length) === 0) {
+    if (!host.fileExists(targetFile)) {
       changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
       addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
     } else {
@@ -134941,6 +134945,13 @@ ${lanes.join("\n")}
     if (typeof targetFile !== "string") {
       if (targetFile.statements.length > 0) {
         changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+      } else {
+        changes.insertNodesAtEndOfFile(
+          targetFile,
+          body,
+          /*blankLineBetween*/
+          false
+        );
       }
       if (imports.length > 0) {
         insertImports(
@@ -135527,6 +135538,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);
@@ -135722,6 +135737,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"() {
@@ -136985,7 +137013,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) => {
@@ -139843,7 +139871,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 = {
@@ -139856,6 +139888,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;
@@ -139910,10 +139943,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);
             }
           }
         }
@@ -160833,9 +160867,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));
@@ -160862,8 +160896,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) {
@@ -162375,7 +162409,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 : "";
@@ -165896,6 +165930,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             this.insertNodeAt(sourceFile, pos, insert, options);
           }
         }
+        insertNodesAtEndOfFile(sourceFile, newNodes, blankLineBetween) {
+          this.insertAtEndOfFile(sourceFile, newNodes, blankLineBetween);
+        }
+        insertAtEndOfFile(sourceFile, insert, blankLineBetween) {
+          const pos = sourceFile.end + 1;
+          const options = {
+            prefix: this.newLineCharacter,
+            suffix: this.newLineCharacter + (blankLineBetween ? this.newLineCharacter : "")
+          };
+          this.insertNodesAt(sourceFile, pos, insert, options);
+        }
         insertStatementsInNewFile(fileName, statements, oldFile) {
           if (!this.newFileChanges) {
             this.newFileChanges = createMultiMap();
@@ -167928,7 +167973,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,
@@ -167938,25 +167984,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-dev.20230523`;
+var version = `${versionMajorMinor}.0-dev.20230526`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230523",
+    "version": "5.2.0-dev.20230526",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "2beeb8b93143f75cdf788d05bb3678ce3ff0e2b3"
+    "gitHead": "fb7efcfe06ed68bf31614e43f474732167302728"
 }