typescript 5.2.0-dev.20230804 → 5.2.0-dev.20230805

package/lib/tsserver.js

@@ -2331,7 +2331,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230804`;
+var version = `${versionMajorMinor}.0-dev.20230805`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6625,15 +6625,13 @@ var NodeCheckFlags = /* @__PURE__ */ ((NodeCheckFlags2) => {
   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 || {});
 var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
@@ -29939,7 +29937,7 @@ function createAccessorPropertyBackingField(factory2, node, modifiers, initializ
     initializer
   );
 }
-function createAccessorPropertyGetRedirector(factory2, node, modifiers, name) {
+function createAccessorPropertyGetRedirector(factory2, node, modifiers, name, receiver = factory2.createThis()) {
   return factory2.createGetAccessorDeclaration(
     modifiers,
     name,
@@ -29949,7 +29947,7 @@ function createAccessorPropertyGetRedirector(factory2, node, modifiers, name) {
     factory2.createBlock([
       factory2.createReturnStatement(
         factory2.createPropertyAccessExpression(
-          factory2.createThis(),
+          receiver,
           factory2.getGeneratedPrivateNameForNode(
             node.name,
             /*prefix*/
@@ -29961,7 +29959,7 @@ function createAccessorPropertyGetRedirector(factory2, node, modifiers, name) {
     ])
   );
 }
-function createAccessorPropertySetRedirector(factory2, node, modifiers, name) {
+function createAccessorPropertySetRedirector(factory2, node, modifiers, name, receiver = factory2.createThis()) {
   return factory2.createSetAccessorDeclaration(
     modifiers,
     name,
@@ -29976,7 +29974,7 @@ function createAccessorPropertySetRedirector(factory2, node, modifiers, name) {
       factory2.createExpressionStatement(
         factory2.createAssignment(
           factory2.createPropertyAccessExpression(
-            factory2.createThis(),
+            receiver,
             factory2.getGeneratedPrivateNameForNode(
               node.name,
               /*prefix*/
@@ -70858,8 +70856,8 @@ function createTypeChecker(host) {
     }
     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);
       }
@@ -70867,7 +70865,7 @@ function createTypeChecker(host) {
     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 */) {
@@ -70973,11 +70971,11 @@ function createTypeChecker(host) {
         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(
@@ -71054,17 +71052,7 @@ function createTypeChecker(host) {
     }
     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*/
@@ -71072,14 +71060,7 @@ function createTypeChecker(host) {
           /*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*/
@@ -71088,6 +71069,11 @@ function createTypeChecker(host) {
             false
           );
         }
+        if (container.kind !== 312 /* SourceFile */) {
+          getNodeLinks(declaration).flags |= 262144 /* ContainsConstructorReference */;
+          getNodeLinks(container).flags |= 262144 /* ContainsConstructorReference */;
+          getNodeLinks(node).flags |= 536870912 /* ConstructorReference */;
+        }
       }
     }
     checkNestedBlockScopedBinding(node, symbol);
@@ -71218,7 +71204,7 @@ function createTypeChecker(host) {
       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 */;
@@ -71496,7 +71482,7 @@ function createTypeChecker(host) {
       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 */;
           }
         });
       }
@@ -75038,7 +75024,7 @@ function createTypeChecker(host) {
     }
   }
   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)) {
@@ -79945,7 +79931,7 @@ function createTypeChecker(host) {
   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);
@@ -81698,7 +81684,7 @@ function createTypeChecker(host) {
   }
   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);
     }
@@ -81712,18 +81698,18 @@ function createTypeChecker(host) {
     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;
       }
     }
@@ -94013,6 +93999,11 @@ function transformClassFields(context) {
       }
     }
   }
+  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);
@@ -94039,11 +94030,13 @@ function transformClassFields(context) {
     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);
@@ -94600,6 +94593,7 @@ function transformClassFields(context) {
     return filter(node.members, isNonStaticMethodOrAccessorWithPrivateName);
   }
   function getClassFacts(node) {
+    var _a;
     let facts = 0 /* None */;
     const original = getOriginalNode(node);
     if (isClassDeclaration(original) && classOrConstructorParameterIsDecorated(legacyDecorators, original)) {
@@ -94616,6 +94610,8 @@ function transformClassFields(context) {
       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 */) {
@@ -94636,6 +94632,9 @@ function transformClassFields(context) {
           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);
@@ -94736,10 +94735,11 @@ function transformClassFields(context) {
         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);
@@ -94774,6 +94774,11 @@ function transformClassFields(context) {
         )
       ));
     }
+    const alias = getClassLexicalEnvironment().classConstructor;
+    if (isClassWithConstructorReference && alias) {
+      enableSubstitutionForClassAliases();
+      classAliases[getOriginalNodeId(node)] = alias;
+    }
     const classDecl = factory2.updateClassDeclaration(
       node,
       modifiers,
@@ -94796,14 +94801,14 @@ function transformClassFields(context) {
     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,
@@ -95770,7 +95775,7 @@ function transformClassFields(context) {
   }
   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];
@@ -96624,7 +96629,7 @@ function transformLegacyDecorators(context) {
     }
   }
   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;
@@ -96657,7 +96662,7 @@ function transformLegacyDecorators(context) {
   }
   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];
@@ -96683,6 +96688,7 @@ function transformESDecorators(context) {
     endLexicalEnvironment,
     hoistVariableDeclaration
   } = context;
+  const languageVersion = getEmitScriptTarget(context.getCompilerOptions());
   let top;
   let classInfo;
   let classThis;
@@ -98184,6 +98190,17 @@ function transformESDecorators(context) {
   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) {
@@ -104827,10 +104844,10 @@ function transformES2015(context) {
         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)) {
@@ -138396,7 +138413,7 @@ registerRefactor(refactorNameForMoveToFile, {
       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));
@@ -139032,25 +139049,25 @@ function getRangeToMove(context) {
   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) {
@@ -139305,10 +139322,12 @@ function getOverloadRangeToMove(sourceFile, statement) {
     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 start2 = findIndex(sourceFile.statements, (s) => s.end >= firstDecl.end);
+    return { toMove: statementsToMove, start: start2, end };
   }
   return void 0;
 }
@@ -164743,8 +164762,10 @@ function provideInlayHints(context) {
   }
   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 += ":";
     }
@@ -164752,7 +164773,8 @@ function provideInlayHints(context) {
       text: hintText,
       position,
       kind: "Parameter" /* Parameter */,
-      whitespaceAfter: true
+      whitespaceAfter: true,
+      displayParts
     });
   }
   function addTypeHints(text, position) {
@@ -183640,19 +183662,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/tsserverlibrary.d.ts

@@ -2124,11 +2124,13 @@ declare namespace ts {
                 arguments: InlayHintsRequestArgs;
             }
             interface InlayHintItem {
-                text: string | InlayHintItemDisplayPart[];
+                /** This property will be the empty string when displayParts is set. */
+                text: string;
                 position: Location;
                 kind: InlayHintKind;
                 whitespaceBefore?: boolean;
                 whitespaceAfter?: boolean;
+                displayParts?: InlayHintItemDisplayPart[];
             }
             interface InlayHintItemDisplayPart {
                 text: string;
@@ -10390,11 +10392,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;