typescript 5.2.0-dev.20230524 → 5.2.0-dev.20230527

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.20230524`;
+var version = `${versionMajorMinor}.0-dev.20230527`;
 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) => {
@@ -52553,32 +52554,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 +61934,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 +62839,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));
@@ -63173,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);
@@ -69451,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;
           }
@@ -77938,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(
@@ -78000,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 */:
@@ -78159,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);
@@ -78475,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);
@@ -78816,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;
@@ -78892,7 +78904,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);
       }
     }
@@ -135594,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, {
@@ -135617,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 }
         ] }
@@ -135840,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"
   }
 };
@@ -136506,10 +136518,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 +136558,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 +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);
@@ -137328,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,
@@ -137546,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, {
@@ -138508,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) => {
@@ -140484,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,
@@ -140541,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,
@@ -141884,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 = {
@@ -141897,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;
@@ -141951,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);
           }
         }
       }
@@ -150434,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)];
@@ -153486,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,
@@ -161507,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));
@@ -161536,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) {
@@ -163088,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 : "";
@@ -166011,6 +166050,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 +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,
@@ -168438,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.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[];