typescript 5.2.0-dev.20230804 → 5.2.0-dev.20230806

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230804`;
+      version = `${versionMajorMinor}.0-dev.20230806`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4387,15 +4387,13 @@ ${lanes.join("\n")}
         NodeCheckFlags2[NodeCheckFlags2["ContainsCapturedBlockScopeBinding"] = 8192] = "ContainsCapturedBlockScopeBinding";
         NodeCheckFlags2[NodeCheckFlags2["CapturedBlockScopedBinding"] = 16384] = "CapturedBlockScopedBinding";
         NodeCheckFlags2[NodeCheckFlags2["BlockScopedBindingInLoop"] = 32768] = "BlockScopedBindingInLoop";
-        NodeCheckFlags2[NodeCheckFlags2["ClassWithBodyScopedClassBinding"] = 65536] = "ClassWithBodyScopedClassBinding";
-        NodeCheckFlags2[NodeCheckFlags2["BodyScopedClassBinding"] = 131072] = "BodyScopedClassBinding";
-        NodeCheckFlags2[NodeCheckFlags2["NeedsLoopOutParameter"] = 262144] = "NeedsLoopOutParameter";
-        NodeCheckFlags2[NodeCheckFlags2["AssignmentsMarked"] = 524288] = "AssignmentsMarked";
-        NodeCheckFlags2[NodeCheckFlags2["ClassWithConstructorReference"] = 1048576] = "ClassWithConstructorReference";
-        NodeCheckFlags2[NodeCheckFlags2["ConstructorReferenceInClass"] = 2097152] = "ConstructorReferenceInClass";
-        NodeCheckFlags2[NodeCheckFlags2["ContainsClassWithPrivateIdentifiers"] = 4194304] = "ContainsClassWithPrivateIdentifiers";
-        NodeCheckFlags2[NodeCheckFlags2["ContainsSuperPropertyInStaticInitializer"] = 8388608] = "ContainsSuperPropertyInStaticInitializer";
-        NodeCheckFlags2[NodeCheckFlags2["InCheckIdentifier"] = 16777216] = "InCheckIdentifier";
+        NodeCheckFlags2[NodeCheckFlags2["NeedsLoopOutParameter"] = 65536] = "NeedsLoopOutParameter";
+        NodeCheckFlags2[NodeCheckFlags2["AssignmentsMarked"] = 131072] = "AssignmentsMarked";
+        NodeCheckFlags2[NodeCheckFlags2["ContainsConstructorReference"] = 262144] = "ContainsConstructorReference";
+        NodeCheckFlags2[NodeCheckFlags2["ConstructorReference"] = 536870912] = "ConstructorReference";
+        NodeCheckFlags2[NodeCheckFlags2["ContainsClassWithPrivateIdentifiers"] = 1048576] = "ContainsClassWithPrivateIdentifiers";
+        NodeCheckFlags2[NodeCheckFlags2["ContainsSuperPropertyInStaticInitializer"] = 2097152] = "ContainsSuperPropertyInStaticInitializer";
+        NodeCheckFlags2[NodeCheckFlags2["InCheckIdentifier"] = 4194304] = "InCheckIdentifier";
         return NodeCheckFlags2;
       })(NodeCheckFlags || {});
       TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
@@ -27672,7 +27670,7 @@ ${lanes.join("\n")}
       initializer
     );
   }
-  function createAccessorPropertyGetRedirector(factory2, node, modifiers, name) {
+  function createAccessorPropertyGetRedirector(factory2, node, modifiers, name, receiver = factory2.createThis()) {
     return factory2.createGetAccessorDeclaration(
       modifiers,
       name,
@@ -27682,7 +27680,7 @@ ${lanes.join("\n")}
       factory2.createBlock([
         factory2.createReturnStatement(
           factory2.createPropertyAccessExpression(
-            factory2.createThis(),
+            receiver,
             factory2.getGeneratedPrivateNameForNode(
               node.name,
               /*prefix*/
@@ -27694,7 +27692,7 @@ ${lanes.join("\n")}
       ])
     );
   }
-  function createAccessorPropertySetRedirector(factory2, node, modifiers, name) {
+  function createAccessorPropertySetRedirector(factory2, node, modifiers, name, receiver = factory2.createThis()) {
     return factory2.createSetAccessorDeclaration(
       modifiers,
       name,
@@ -27709,7 +27707,7 @@ ${lanes.join("\n")}
         factory2.createExpressionStatement(
           factory2.createAssignment(
             factory2.createPropertyAccessExpression(
-              factory2.createThis(),
+              receiver,
               factory2.getGeneratedPrivateNameForNode(
                 node.name,
                 /*prefix*/
@@ -68621,8 +68619,8 @@ ${lanes.join("\n")}
       }
       const parent2 = getRootDeclaration(symbol.valueDeclaration).parent;
       const links = getNodeLinks(parent2);
-      if (!(links.flags & 524288 /* AssignmentsMarked */)) {
-        links.flags |= 524288 /* AssignmentsMarked */;
+      if (!(links.flags & 131072 /* AssignmentsMarked */)) {
+        links.flags |= 131072 /* AssignmentsMarked */;
         if (!hasParentWithAssignmentsMarked(parent2)) {
           markNodeAssignments(parent2);
         }
@@ -68630,7 +68628,7 @@ ${lanes.join("\n")}
       return symbol.isAssigned || false;
     }
     function hasParentWithAssignmentsMarked(node) {
-      return !!findAncestor(node.parent, (node2) => (isFunctionLike(node2) || isCatchClause(node2)) && !!(getNodeLinks(node2).flags & 524288 /* AssignmentsMarked */));
+      return !!findAncestor(node.parent, (node2) => (isFunctionLike(node2) || isCatchClause(node2)) && !!(getNodeLinks(node2).flags & 131072 /* AssignmentsMarked */));
     }
     function markNodeAssignments(node) {
       if (node.kind === 80 /* Identifier */) {
@@ -68736,11 +68734,11 @@ ${lanes.join("\n")}
           const parent2 = declaration.parent.parent;
           if (parent2.kind === 260 /* VariableDeclaration */ && getCombinedNodeFlagsCached(declaration) & 6 /* Constant */ || parent2.kind === 169 /* Parameter */) {
             const links = getNodeLinks(parent2);
-            if (!(links.flags & 16777216 /* InCheckIdentifier */)) {
-              links.flags |= 16777216 /* InCheckIdentifier */;
+            if (!(links.flags & 4194304 /* InCheckIdentifier */)) {
+              links.flags |= 4194304 /* InCheckIdentifier */;
               const parentType = getTypeForBindingElementParent(parent2, 0 /* Normal */);
               const parentTypeConstraint = parentType && mapType(parentType, getBaseConstraintOrType);
-              links.flags &= ~16777216 /* InCheckIdentifier */;
+              links.flags &= ~4194304 /* InCheckIdentifier */;
               if (parentTypeConstraint && parentTypeConstraint.flags & 1048576 /* Union */ && !(parent2.kind === 169 /* Parameter */ && isSymbolAssigned(symbol))) {
                 const pattern = declaration.parent;
                 const narrowedType = getFlowTypeOfReference(
@@ -68817,17 +68815,7 @@ ${lanes.join("\n")}
       }
       let declaration = localOrExportSymbol.valueDeclaration;
       if (declaration && localOrExportSymbol.flags & 32 /* Class */) {
-        if (declaration.kind === 263 /* ClassDeclaration */ && nodeIsDecorated(legacyDecorators, declaration)) {
-          let container = getContainingClass(node);
-          while (container !== void 0) {
-            if (container === declaration && container.name !== node) {
-              getNodeLinks(declaration).flags |= 1048576 /* ClassWithConstructorReference */;
-              getNodeLinks(node).flags |= 2097152 /* ConstructorReferenceInClass */;
-              break;
-            }
-            container = getContainingClass(container);
-          }
-        } else if (declaration.kind === 231 /* ClassExpression */) {
+        if (isClassLike(declaration) && declaration.name !== node) {
           let container = getThisContainer(
             node,
             /*includeArrowFunctions*/
@@ -68835,14 +68823,7 @@ ${lanes.join("\n")}
             /*includeClassComputedPropertyName*/
             false
           );
-          while (container.kind !== 312 /* SourceFile */) {
-            if (container.parent === declaration) {
-              if (isPropertyDeclaration(container) && isStatic(container) || isClassStaticBlockDeclaration(container)) {
-                getNodeLinks(declaration).flags |= 1048576 /* ClassWithConstructorReference */;
-                getNodeLinks(node).flags |= 2097152 /* ConstructorReferenceInClass */;
-              }
-              break;
-            }
+          while (container.kind !== 312 /* SourceFile */ && container.parent !== declaration) {
             container = getThisContainer(
               container,
               /*includeArrowFunctions*/
@@ -68851,6 +68832,11 @@ ${lanes.join("\n")}
               false
             );
           }
+          if (container.kind !== 312 /* SourceFile */) {
+            getNodeLinks(declaration).flags |= 262144 /* ContainsConstructorReference */;
+            getNodeLinks(container).flags |= 262144 /* ContainsConstructorReference */;
+            getNodeLinks(node).flags |= 536870912 /* ConstructorReference */;
+          }
         }
       }
       checkNestedBlockScopedBinding(node, symbol);
@@ -68981,7 +68967,7 @@ ${lanes.join("\n")}
         if (isForStatement(container)) {
           const varDeclList = getAncestor(symbol.valueDeclaration, 261 /* VariableDeclarationList */);
           if (varDeclList && varDeclList.parent === container && isAssignedInBodyOfForStatement(node, container)) {
-            getNodeLinks(symbol.valueDeclaration).flags |= 262144 /* NeedsLoopOutParameter */;
+            getNodeLinks(symbol.valueDeclaration).flags |= 65536 /* NeedsLoopOutParameter */;
           }
         }
         getNodeLinks(symbol.valueDeclaration).flags |= 32768 /* BlockScopedBindingInLoop */;
@@ -69259,7 +69245,7 @@ ${lanes.join("\n")}
         if (!isCallExpression2 && languageVersion >= 2 /* ES2015 */ && languageVersion <= 8 /* ES2021 */ && (isPropertyDeclaration(container) || isClassStaticBlockDeclaration(container))) {
           forEachEnclosingBlockScopeContainer(node.parent, (current) => {
             if (!isSourceFile(current) || isExternalOrCommonJsModule(current)) {
-              getNodeLinks(current).flags |= 8388608 /* ContainsSuperPropertyInStaticInitializer */;
+              getNodeLinks(current).flags |= 2097152 /* ContainsSuperPropertyInStaticInitializer */;
             }
           });
         }
@@ -72801,7 +72787,7 @@ ${lanes.join("\n")}
       }
     }
     function getThisArgumentOfCall(node) {
-      const expression = node.kind === 213 /* CallExpression */ ? node.expression : node.kind === 215 /* TaggedTemplateExpression */ ? node.tag : void 0;
+      const expression = node.kind === 213 /* CallExpression */ ? node.expression : node.kind === 215 /* TaggedTemplateExpression */ ? node.tag : node.kind === 170 /* Decorator */ && !legacyDecorators ? node.expression : void 0;
       if (expression) {
         const callee = skipOuterExpressions(expression);
         if (isAccessExpression(callee)) {
@@ -77708,7 +77694,7 @@ ${lanes.join("\n")}
     function setNodeLinksForPrivateIdentifierScope(node) {
       if (isPrivateIdentifier(node.name) && languageVersion < 99 /* ESNext */) {
         for (let lexicalScope = getEnclosingBlockScopeContainer(node); !!lexicalScope; lexicalScope = getEnclosingBlockScopeContainer(lexicalScope)) {
-          getNodeLinks(lexicalScope).flags |= 4194304 /* ContainsClassWithPrivateIdentifiers */;
+          getNodeLinks(lexicalScope).flags |= 1048576 /* ContainsClassWithPrivateIdentifiers */;
         }
         if (isClassExpression(node.parent)) {
           const enclosingIterationStatement = getEnclosingIterationStatement(node.parent);
@@ -79461,7 +79447,7 @@ ${lanes.join("\n")}
     }
     function checkWeakMapSetCollision(node) {
       const enclosingBlockScope = getEnclosingBlockScopeContainer(node);
-      if (getNodeCheckFlags(enclosingBlockScope) & 4194304 /* ContainsClassWithPrivateIdentifiers */) {
+      if (getNodeCheckFlags(enclosingBlockScope) & 1048576 /* ContainsClassWithPrivateIdentifiers */) {
         Debug.assert(isNamedDeclaration(node) && isIdentifier(node.name) && typeof node.name.escapedText === "string", "The target of a WeakMap/WeakSet collision check should be an identifier");
         errorSkippedOn("noEmit", node, Diagnostics.Compiler_reserves_name_0_when_emitting_private_identifier_downlevel, node.name.escapedText);
       }
@@ -79475,18 +79461,18 @@ ${lanes.join("\n")}
       let hasCollision = false;
       if (isClassExpression(node)) {
         for (const member of node.members) {
-          if (getNodeCheckFlags(member) & 8388608 /* ContainsSuperPropertyInStaticInitializer */) {
+          if (getNodeCheckFlags(member) & 2097152 /* ContainsSuperPropertyInStaticInitializer */) {
             hasCollision = true;
             break;
           }
         }
       } else if (isFunctionExpression(node)) {
-        if (getNodeCheckFlags(node) & 8388608 /* ContainsSuperPropertyInStaticInitializer */) {
+        if (getNodeCheckFlags(node) & 2097152 /* ContainsSuperPropertyInStaticInitializer */) {
           hasCollision = true;
         }
       } else {
         const container = getEnclosingBlockScopeContainer(node);
-        if (container && getNodeCheckFlags(container) & 8388608 /* ContainsSuperPropertyInStaticInitializer */) {
+        if (container && getNodeCheckFlags(container) & 2097152 /* ContainsSuperPropertyInStaticInitializer */) {
           hasCollision = true;
         }
       }
@@ -91965,6 +91951,11 @@ ${lanes.join("\n")}
         }
       }
     }
+    function getClassThis() {
+      const lex = getClassLexicalEnvironment();
+      const classThis = lex.classThis ?? lex.classConstructor ?? (currentClassContainer == null ? void 0 : currentClassContainer.name);
+      return Debug.checkDefined(classThis);
+    }
     function transformAutoAccessor(node) {
       const commentRange = getCommentRange(node);
       const sourceMapRange = getSourceMapRange(node);
@@ -91991,11 +91982,13 @@ ${lanes.join("\n")}
       setOriginalNode(backingField, node);
       setEmitFlags(backingField, 3072 /* NoComments */);
       setSourceMapRange(backingField, sourceMapRange);
-      const getter = createAccessorPropertyGetRedirector(factory2, node, modifiers, getterName);
+      const receiver = isStatic(node) ? getClassThis() : factory2.createThis();
+      const getter = createAccessorPropertyGetRedirector(factory2, node, modifiers, getterName, receiver);
       setOriginalNode(getter, node);
       setCommentRange(getter, commentRange);
       setSourceMapRange(getter, sourceMapRange);
-      const setter = createAccessorPropertySetRedirector(factory2, node, modifiers, setterName);
+      const setterModifiers = factory2.createModifiersFromModifierFlags(modifiersToFlags(modifiers));
+      const setter = createAccessorPropertySetRedirector(factory2, node, setterModifiers, setterName, receiver);
       setOriginalNode(setter, node);
       setEmitFlags(setter, 3072 /* NoComments */);
       setSourceMapRange(setter, sourceMapRange);
@@ -92552,6 +92545,7 @@ ${lanes.join("\n")}
       return filter(node.members, isNonStaticMethodOrAccessorWithPrivateName);
     }
     function getClassFacts(node) {
+      var _a;
       let facts = 0 /* None */;
       const original = getOriginalNode(node);
       if (isClassDeclaration(original) && classOrConstructorParameterIsDecorated(legacyDecorators, original)) {
@@ -92568,6 +92562,8 @@ ${lanes.join("\n")}
         if (isStatic(member)) {
           if (member.name && (isPrivateIdentifier(member.name) || isAutoAccessorPropertyDeclaration(member)) && shouldTransformPrivateElementsOrClassStaticBlocks) {
             facts |= 2 /* NeedsClassConstructorReference */;
+          } else if (isAutoAccessorPropertyDeclaration(member) && shouldTransformAutoAccessors === -1 /* True */ && !node.name && !((_a = node.emitNode) == null ? void 0 : _a.classThis)) {
+            facts |= 2 /* NeedsClassConstructorReference */;
           }
           if (isPropertyDeclaration(member) || isClassStaticBlockDeclaration(member)) {
             if (shouldTransformThisInStaticInitializers && member.transformFlags & 16384 /* ContainsLexicalThis */) {
@@ -92588,6 +92584,9 @@ ${lanes.join("\n")}
             containsInstancePrivateElements || (containsInstancePrivateElements = isPrivateIdentifierClassElementDeclaration(member));
           } else if (isPrivateIdentifierClassElementDeclaration(member)) {
             containsInstancePrivateElements = true;
+            if (resolver.getNodeCheckFlags(member) & 262144 /* ContainsConstructorReference */) {
+              facts |= 2 /* NeedsClassConstructorReference */;
+            }
           } else if (isPropertyDeclaration(member)) {
             containsPublicInstanceFields = true;
             containsInitializedPublicInstanceFields || (containsInitializedPublicInstanceFields = !!member.initializer);
@@ -92688,10 +92687,11 @@ ${lanes.join("\n")}
           getClassLexicalEnvironment().classConstructor = factory2.cloneNode(temp);
           pendingClassReferenceAssignment = factory2.createAssignment(temp, factory2.getInternalName(node));
         }
-        if ((_b = node.emitNode) == null ? void 0 : _b.classThis) {
-          getClassLexicalEnvironment().classThis = node.emitNode.classThis;
-        }
       }
+      if ((_b = node.emitNode) == null ? void 0 : _b.classThis) {
+        getClassLexicalEnvironment().classThis = node.emitNode.classThis;
+      }
+      const isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 262144 /* ContainsConstructorReference */;
       const isExport = hasSyntacticModifier(node, 1 /* Export */);
       const isDefault = hasSyntacticModifier(node, 1024 /* Default */);
       let modifiers = visitNodes2(node.modifiers, modifierVisitor, isModifier);
@@ -92726,6 +92726,11 @@ ${lanes.join("\n")}
           )
         ));
       }
+      const alias = getClassLexicalEnvironment().classConstructor;
+      if (isClassWithConstructorReference && alias) {
+        enableSubstitutionForClassAliases();
+        classAliases[getOriginalNodeId(node)] = alias;
+      }
       const classDecl = factory2.updateClassDeclaration(
         node,
         modifiers,
@@ -92748,14 +92753,14 @@ ${lanes.join("\n")}
       var _a, _b, _c;
       const isDecoratedClassDeclaration = !!(facts & 1 /* ClassWasDecorated */);
       const staticPropertiesOrClassStaticBlocks = getStaticPropertiesAndClassStaticBlock(node);
-      const isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 1048576 /* ClassWithConstructorReference */;
+      const classCheckFlags = resolver.getNodeCheckFlags(node);
+      const isClassWithConstructorReference = classCheckFlags & 262144 /* ContainsConstructorReference */;
       let temp;
       function createClassTempVar() {
         var _a2;
         if (shouldTransformPrivateElementsOrClassStaticBlocks && ((_a2 = node.emitNode) == null ? void 0 : _a2.classThis)) {
           return getClassLexicalEnvironment().classConstructor = node.emitNode.classThis;
         }
-        const classCheckFlags = resolver.getNodeCheckFlags(node);
         const requiresBlockScopedVar = classCheckFlags & 32768 /* BlockScopedBindingInLoop */;
         const temp2 = factory2.createTempVariable(
           requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration,
@@ -93722,7 +93727,7 @@ ${lanes.join("\n")}
     }
     function trySubstituteClassAlias(node) {
       if (enabledSubstitutions & 1 /* ClassAliases */) {
-        if (resolver.getNodeCheckFlags(node) & 2097152 /* ConstructorReferenceInClass */) {
+        if (resolver.getNodeCheckFlags(node) & 536870912 /* ConstructorReference */) {
           const declaration = resolver.getReferencedValueDeclaration(node);
           if (declaration) {
             const classAlias = classAliases[declaration.id];
@@ -94588,7 +94593,7 @@ ${lanes.join("\n")}
       }
     }
     function getClassAliasIfNeeded(node) {
-      if (resolver.getNodeCheckFlags(node) & 1048576 /* ClassWithConstructorReference */) {
+      if (resolver.getNodeCheckFlags(node) & 262144 /* ContainsConstructorReference */) {
         enableSubstitutionForClassAliases();
         const classAlias = factory2.createUniqueName(node.name && !isGeneratedIdentifier(node.name) ? idText(node.name) : "default");
         classAliases[getOriginalNodeId(node)] = classAlias;
@@ -94621,7 +94626,7 @@ ${lanes.join("\n")}
     }
     function trySubstituteClassAlias(node) {
       if (classAliases) {
-        if (resolver.getNodeCheckFlags(node) & 2097152 /* ConstructorReferenceInClass */) {
+        if (resolver.getNodeCheckFlags(node) & 536870912 /* ConstructorReference */) {
           const declaration = resolver.getReferencedValueDeclaration(node);
           if (declaration) {
             const classAlias = classAliases[declaration.id];
@@ -94653,6 +94658,7 @@ ${lanes.join("\n")}
       endLexicalEnvironment,
       hoistVariableDeclaration
     } = context;
+    const languageVersion = getEmitScriptTarget(context.getCompilerOptions());
     let top;
     let classInfo;
     let classThis;
@@ -96154,6 +96160,17 @@ ${lanes.join("\n")}
     function transformDecorator(decorator) {
       const expression = visitNode(decorator.expression, visitor, isExpression);
       setEmitFlags(expression, 3072 /* NoComments */);
+      const innerExpression = skipOuterExpressions(expression);
+      if (isAccessExpression(innerExpression)) {
+        const { target, thisArg } = factory2.createCallBinding(
+          expression,
+          hoistVariableDeclaration,
+          languageVersion,
+          /*cacheIdentifiers*/
+          true
+        );
+        return factory2.restoreOuterExpressions(expression, factory2.createFunctionBindCall(target, thisArg, []));
+      }
       return expression;
     }
     function createDescriptorMethod(original, name, modifiers, asteriskToken, kind, parameters, body) {
@@ -102852,10 +102869,10 @@ ${lanes.join("\n")}
           name
         ));
         const checkFlags = resolver.getNodeCheckFlags(decl);
-        if (checkFlags & 262144 /* NeedsLoopOutParameter */ || hasCapturedBindingsInForHead) {
+        if (checkFlags & 65536 /* NeedsLoopOutParameter */ || hasCapturedBindingsInForHead) {
           const outParamName = factory2.createUniqueName("out_" + idText(name));
           let flags = 0 /* None */;
-          if (checkFlags & 262144 /* NeedsLoopOutParameter */) {
+          if (checkFlags & 65536 /* NeedsLoopOutParameter */) {
             flags |= 1 /* Body */;
           }
           if (isForStatement(container)) {
@@ -137403,25 +137420,25 @@ ${lanes.join("\n")}
     const { file } = context;
     const range = createTextRangeFromSpan(getRefactorContextSpan(context));
     const { statements } = file;
-    const startNodeIndex = findIndex(statements, (s) => s.end > range.pos);
+    let startNodeIndex = findIndex(statements, (s) => s.end > range.pos);
     if (startNodeIndex === -1)
       return void 0;
     const startStatement = statements[startNodeIndex];
-    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;
+      startNodeIndex = overloadRangeToMove.start;
+    }
+    let endNodeIndex = findIndex(statements, (s) => s.end >= range.end, startNodeIndex);
+    if (endNodeIndex !== -1 && range.end <= statements[endNodeIndex].getStart()) {
+      endNodeIndex--;
+    }
+    const endingOverloadRangeToMove = getOverloadRangeToMove(file, statements[endNodeIndex]);
+    if (endingOverloadRangeToMove) {
+      endNodeIndex = endingOverloadRangeToMove.end;
     }
-    if (range.pos > startStatement.getStart(file))
-      return void 0;
-    const afterEndNodeIndex = findIndex(statements, (s) => s.end > range.end, startNodeIndex);
-    if (afterEndNodeIndex !== -1 && (afterEndNodeIndex === 0 || statements[afterEndNodeIndex].getStart(file) < range.end))
-      return void 0;
     return {
-      toMove: statements.slice(startNodeIndex, afterEndNodeIndex === -1 ? statements.length : afterEndNodeIndex),
-      afterLast: afterEndNodeIndex === -1 ? void 0 : statements[afterEndNodeIndex]
+      toMove: statements.slice(startNodeIndex, endNodeIndex === -1 ? statements.length : endNodeIndex + 1),
+      afterLast: endNodeIndex === -1 ? void 0 : statements[endNodeIndex + 1]
     };
   }
   function getStatementsToMove(context) {
@@ -137676,10 +137693,12 @@ ${lanes.join("\n")}
       if (declarations === void 0 || length(declarations) <= 1 || !contains(declarations, statement)) {
         return void 0;
       }
+      const firstDecl = declarations[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 };
+      const end = findIndex(sourceFile.statements, (s) => s.end >= lastDecl.end);
+      const start = findIndex(sourceFile.statements, (s) => s.end >= firstDecl.end);
+      return { toMove: statementsToMove, start, end };
     }
     return void 0;
   }
@@ -137726,7 +137745,7 @@ ${lanes.join("\n")}
             if (host.fileExists(targetFile) && program.getSourceFile(targetFile) === void 0) {
               return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_statements_to_the_selected_file));
             }
-            const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, program, statements, t, context.host, context.preferences));
+            const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
             return { edits, renameFilename: void 0, renameLocation: void 0 };
           }
           return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_to_file_selected_file_is_invalid));
@@ -164091,8 +164110,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function addParameterHints(text, parameter, position, isFirstVariadicArgument, sourceFile) {
       let hintText = `${isFirstVariadicArgument ? "..." : ""}${text}`;
+      let displayParts;
       if (shouldUseInteractiveInlayHints(preferences)) {
-        hintText = [getNodeDisplayPart(hintText, parameter, sourceFile), { text: ":" }];
+        displayParts = [getNodeDisplayPart(hintText, parameter, sourceFile), { text: ":" }];
+        hintText = "";
       } else {
         hintText += ":";
       }
@@ -164100,7 +164121,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         text: hintText,
         position,
         kind: "Parameter" /* Parameter */,
-        whitespaceAfter: true
+        whitespaceAfter: true,
+        displayParts
       });
     }
     function addTypeHints(text, position) {
@@ -181047,19 +181069,18 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
           const hints = project.getLanguageService().provideInlayHints(file, args, this.getPreferences(file));
           return hints.map((hint) => {
-            const { text, position } = hint;
-            const hintText = typeof text === "string" ? text : text.map(({ text: text2, span, file: file2 }) => ({
-              text: text2,
-              span: span && {
-                start: scriptInfo.positionToLineOffset(span.start),
-                end: scriptInfo.positionToLineOffset(span.start + span.length),
-                file: file2
-              }
-            }));
+            const { position, displayParts } = hint;
             return {
               ...hint,
               position: scriptInfo.positionToLineOffset(position),
-              text: hintText
+              displayParts: displayParts == null ? void 0 : displayParts.map(({ text, span, file: file2 }) => ({
+                text,
+                span: span && {
+                  start: scriptInfo.positionToLineOffset(span.start),
+                  end: scriptInfo.positionToLineOffset(span.start + span.length),
+                  file: file2
+                }
+              }))
             };
           });
         }

package/lib/typescript.d.ts

@@ -6416,11 +6416,13 @@ declare namespace ts {
         Enum = "Enum"
     }
     interface InlayHint {
-        text: string | InlayHintDisplayPart[];
+        /** This property will be the empty string when displayParts is set. */
+        text: string;
         position: number;
         kind: InlayHintKind;
         whitespaceBefore?: boolean;
         whitespaceAfter?: boolean;
+        displayParts?: InlayHintDisplayPart[];
     }
     interface InlayHintDisplayPart {
         text: string;