@typescript-deploys/pr-build 5.4.0-pr-57394-2 → 5.5.0-pr-57403-12

package/lib/tsc.js

@@ -17,8 +17,8 @@ and limitations under the License.
 "use strict";
 
 // src/compiler/corePublic.ts
-var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240216`;
+var versionMajorMinor = "5.5";
+var version = `${versionMajorMinor}.0-insiders.20240221`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3708,6 +3708,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
   ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";
   ObjectFlags3[ObjectFlags3["InstantiationExpressionType"] = 8388608] = "InstantiationExpressionType";
+  ObjectFlags3[ObjectFlags3["SingleSignatureType"] = 134217728] = "SingleSignatureType";
   ObjectFlags3[ObjectFlags3["IsClassInstanceClone"] = 16777216] = "IsClassInstanceClone";
   ObjectFlags3[ObjectFlags3["IdenticalBaseTypeCalculated"] = 33554432] = "IdenticalBaseTypeCalculated";
   ObjectFlags3[ObjectFlags3["IdenticalBaseTypeExists"] = 67108864] = "IdenticalBaseTypeExists";
@@ -48774,7 +48775,7 @@ function createTypeChecker(host) {
         }
         const abstractSignatures = filter(resolved.constructSignatures, (signature) => !!(signature.flags & 4 /* Abstract */));
         if (some(abstractSignatures)) {
-          const types = map(abstractSignatures, getOrCreateTypeFromSignature);
+          const types = map(abstractSignatures, (s) => getOrCreateTypeFromSignature(s));
           const typeElementCount = resolved.callSignatures.length + (resolved.constructSignatures.length - abstractSignatures.length) + resolved.indexInfos.length + // exclude `prototype` when writing a class expression as a type literal, as per
           // the logic in `createTypeNodesFromResolvedType`.
           (context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */ ? countWhere(resolved.properties, (p) => !(p.flags & 4194304 /* Prototype */)) : length(resolved.properties));
@@ -55315,11 +55316,15 @@ function createTypeChecker(host) {
     return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
   }
   function getResolvedApparentTypeOfMappedType(type) {
-    const typeVariable = getHomomorphicTypeVariable(type);
-    if (typeVariable && !type.declaration.nameType) {
-      const constraint = getConstraintOfTypeParameter(typeVariable);
-      if (constraint && everyType(constraint, isArrayOrTupleType)) {
-        return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+    const target = type.target ?? type;
+    const typeVariable = getHomomorphicTypeVariable(target);
+    if (typeVariable && !target.declaration.nameType) {
+      const constraint = getConstraintTypeFromMappedType(type);
+      if (constraint.flags & 4194304 /* Index */) {
+        const baseConstraint = getBaseConstraintOfType(constraint.type);
+        if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+          return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+        }
       }
     }
     return type;
@@ -56164,6 +56169,12 @@ function createTypeChecker(host) {
       isInJSFile(signature.declaration)
     );
   }
+  function getImplementationSignature(signature) {
+    return signature.typeParameters ? signature.implementationSignatureCache || (signature.implementationSignatureCache = createImplementationSignature(signature)) : signature;
+  }
+  function createImplementationSignature(signature) {
+    return signature.typeParameters ? instantiateSignature(signature, createTypeMapper([], [])) : signature;
+  }
   function getBaseSignature(signature) {
     const typeParameters = signature.typeParameters;
     if (typeParameters) {
@@ -56186,12 +56197,22 @@ function createTypeChecker(host) {
     }
     return signature;
   }
-  function getOrCreateTypeFromSignature(signature) {
+  function getOrCreateTypeFromSignature(signature, outerTypeParameters) {
     var _a;
     if (!signature.isolatedSignatureType) {
       const kind = (_a = signature.declaration) == null ? void 0 : _a.kind;
       const isConstructor = kind === void 0 || kind === 176 /* Constructor */ || kind === 180 /* ConstructSignature */ || kind === 185 /* ConstructorType */;
-      const type = createObjectType(16 /* Anonymous */);
+      const type = createObjectType(16 /* Anonymous */ | 134217728 /* SingleSignatureType */, createSymbol(16 /* Function */, "__function" /* Function */));
+      if (signature.declaration && !nodeIsSynthesized(signature.declaration)) {
+        type.symbol.declarations = [signature.declaration];
+        type.symbol.valueDeclaration = signature.declaration;
+      }
+      outerTypeParameters || (outerTypeParameters = signature.declaration && getOuterTypeParameters(
+        signature.declaration,
+        /*includeThisTypes*/
+        true
+      ));
+      type.outerTypeParameters = outerTypeParameters;
       type.members = emptySymbols;
       type.properties = emptyArray;
       type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -57358,7 +57379,7 @@ function createTypeChecker(host) {
     return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
   }
   function createNormalizedTupleType(target, elementTypes) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!(target.combinedFlags & 14 /* NonRequired */)) {
       return createTypeReference(target, elementTypes);
     }
@@ -57378,8 +57399,10 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-          addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        if (type.flags & 1 /* Any */) {
+          addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+          addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
         } else if (isTupleType(type)) {
           const elements = getElementTypes(type);
           if (elements.length + expandedTypes.length >= 1e4) {
@@ -57394,10 +57417,10 @@ function createTypeChecker(host) {
             return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
           });
         } else {
-          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
         }
       } else {
-        addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+        addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
       }
     }
     for (let i = 0; i < lastRequiredIndex; i++) {
@@ -58761,10 +58784,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function maybeCloneTypeParameter(p) {
-    const constraint = getConstraintOfTypeParameter(p);
-    return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-  }
   function isSimpleTupleType(node) {
     return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
   }
@@ -58794,27 +58813,19 @@ function createTypeChecker(host) {
       const checkTypeDeferred = isDeferredType(checkType, checkTuples);
       let combinedMapper;
       if (root.inferTypeParameters) {
-        const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-        const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
         const context = createInferenceContext(
-          freshParams,
+          root.inferTypeParameters,
           /*signature*/
           void 0,
           0 /* None */
         );
-        if (freshMapper) {
-          const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (let i = 0; i < freshParams.length; i++) {
-            if (freshParams[i] !== root.inferTypeParameters[i]) {
-              freshParams[i].mapper = freshCombinedMapper;
-            }
-          }
+        if (mapper) {
+          context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
-        const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-        combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+        combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
       const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
       if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -59594,7 +59605,7 @@ function createTypeChecker(host) {
     const declaration = type.objectFlags & 4 /* Reference */ ? type.node : type.objectFlags & 8388608 /* InstantiationExpressionType */ ? type.node : type.symbol.declarations[0];
     const links = getNodeLinks(declaration);
     const target = type.objectFlags & 4 /* Reference */ ? links.resolvedType : type.objectFlags & 64 /* Instantiated */ ? type.target : type;
-    let typeParameters = links.outerTypeParameters;
+    let typeParameters = type.objectFlags & 134217728 /* SingleSignatureType */ ? type.outerTypeParameters : links.outerTypeParameters;
     if (!typeParameters) {
       let outerTypeParameters = getOuterTypeParameters(
         declaration,
@@ -59775,6 +59786,9 @@ function createTypeChecker(host) {
     if (type.objectFlags & 8388608 /* InstantiationExpressionType */) {
       result.node = type.node;
     }
+    if (type.objectFlags & 134217728 /* SingleSignatureType */) {
+      result.outerTypeParameters = type.outerTypeParameters;
+    }
     result.target = type;
     result.mapper = mapper;
     result.aliasSymbol = aliasSymbol || type.aliasSymbol;
@@ -60666,8 +60680,8 @@ function createTypeChecker(host) {
     const paramCount = sourceRestType || targetRestType ? Math.min(sourceCount, targetCount) : Math.max(sourceCount, targetCount);
     const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
     for (let i = 0; i < paramCount; i++) {
-      const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-      const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
+      const sourceType = i === restIndex ? getRestOrAnyTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
+      const targetType = i === restIndex ? getRestOrAnyTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
       if (sourceType && targetType) {
         const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
         const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -64395,7 +64409,7 @@ function createTypeChecker(host) {
     if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
       return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
     }
-    const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
+    const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 134217728 /* SingleSignatureType */ && !!length(type.outerTypeParameters) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
     if (type.flags & 3899393 /* ObjectFlagsType */) {
       type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0);
     }
@@ -64677,6 +64691,9 @@ function createTypeChecker(host) {
       pos = p;
     }
   }
+  function isTupleOfSelf(typeParameter, type) {
+    return isTupleType(type) && getTupleElementType(type, 0) === getIndexedAccessType(typeParameter, getNumberLiteralType(0)) && !getTypeOfPropertyOfType(type, "1");
+  }
   function inferTypes(inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
     let bivariant = false;
     let propagationType;
@@ -64762,6 +64779,9 @@ function createTypeChecker(host) {
               inference.priority = priority;
             }
             if (priority === inference.priority) {
+              if (isTupleOfSelf(inference.typeParameter, candidate)) {
+                return;
+              }
               if (contravariant && !bivariant) {
                 if (!contains(inference.contraCandidates, candidate)) {
                   inference.contraCandidates = append(inference.contraCandidates, candidate);
@@ -65328,9 +65348,7 @@ function createTypeChecker(host) {
           inferredType = silentNeverType;
         } else {
           const defaultType = getDefaultFromTypeParameter(inference.typeParameter);
-          if (defaultType) {
-            inferredType = instantiateType(defaultType, mergeTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
-          }
+          inferredType = instantiateType(defaultType, mergeTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
         }
       } else {
         inferredType = getTypeFromInference(inference);
@@ -71718,7 +71736,7 @@ function createTypeChecker(host) {
           void 0,
           checkMode
         );
-        const checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
+        const checkArgType = instantiateType(checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType, signature.mapper);
         const effectiveCheckArgumentNode = getEffectiveCheckNode(arg);
         if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors2 ? effectiveCheckArgumentNode : void 0, effectiveCheckArgumentNode, headMessage, containingMessageChain, errorOutputContainer)) {
           Debug.assert(!reportErrors2 || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
@@ -72262,13 +72280,16 @@ function createTypeChecker(host) {
         return candidate;
       }
       for (let candidateIndex = 0; candidateIndex < candidates2.length; candidateIndex++) {
-        const candidate = candidates2[candidateIndex];
+        let candidate = candidates2[candidateIndex];
         if (!hasCorrectTypeArgumentArity(candidate, typeArguments) || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma2)) {
           continue;
         }
         let checkCandidate;
         let inferenceContext;
         if (candidate.typeParameters) {
+          if (candidate.declaration && findAncestor(node, (a) => a === candidate.declaration)) {
+            candidate = getImplementationSignature(candidate);
+          }
           let typeArgumentTypes;
           if (some(typeArguments)) {
             typeArgumentTypes = checkTypeArguments(
@@ -72288,7 +72309,7 @@ function createTypeChecker(host) {
               /*flags*/
               isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */
             );
-            typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
+            typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext), inferenceContext.nonFixingMapper);
             argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
           }
           checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
@@ -72316,7 +72337,7 @@ function createTypeChecker(host) {
         if (argCheckMode) {
           argCheckMode = 0 /* Normal */;
           if (inferenceContext) {
-            const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
+            const typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext), inferenceContext.mapper);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
             if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma2)) {
               candidateForArgumentArityError = checkCandidate;
@@ -73670,6 +73691,11 @@ function createTypeChecker(host) {
     }
     return createTupleType(types, flags, readonly, names);
   }
+  function getRestOrAnyTypeAtPosition(source, pos) {
+    const restType = getRestTypeAtPosition(source, pos);
+    const elementType = restType && getElementTypeOfArrayType(restType);
+    return elementType && isTypeAny(elementType) ? anyType : restType;
+  }
   function getParameterCount(signature) {
     const length2 = signature.parameters.length;
     if (signatureHasRestParameter(signature)) {
@@ -73726,7 +73752,7 @@ function createTypeChecker(host) {
     if (signatureHasRestParameter(signature)) {
       const restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
       if (!isTupleType(restType)) {
-        return restType;
+        return isTypeAny(restType) ? anyArrayType : restType;
       }
       if (restType.target.hasRestElement) {
         return sliceTupleType(restType, restType.target.fixedLength);
@@ -76028,7 +76054,7 @@ function createTypeChecker(host) {
                 }
               }
             }
-            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
+            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context), flatMap(inferenceContexts, (c) => c && map(c.inferences, (i) => i.typeParameter)).slice());
           }
         }
       }
@@ -77030,20 +77056,17 @@ function createTypeChecker(host) {
     const objectType = type.objectType;
     const indexType = type.indexType;
     const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === 2 /* Remapping */ ? getIndexTypeForMappedType(objectType, 0 /* None */) : getIndexType(objectType, 0 /* None */);
-    if (isTypeAssignableTo(indexType, objectIndexType)) {
+    const hasNumberIndexInfo = !!getIndexInfoOfType(objectType, numberType);
+    if (everyType(indexType, (t) => isTypeAssignableTo(t, objectIndexType) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
       if (accessNode.kind === 212 /* ElementAccessExpression */ && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
         error(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
       }
       return type;
     }
-    const apparentObjectType = getApparentType(objectType);
-    if (getIndexInfoOfType(apparentObjectType, numberType) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
-      return type;
-    }
     if (isGenericObjectType(objectType)) {
       const propertyName = getPropertyNameFromIndex(indexType, accessNode);
       if (propertyName) {
-        const propertySymbol = forEachType(apparentObjectType, (t) => getPropertyOfType(t, propertyName));
+        const propertySymbol = forEachType(getApparentType(objectType), (t) => getPropertyOfType(t, propertyName));
         if (propertySymbol && getDeclarationModifierFlagsFromSymbol(propertySymbol) & 6 /* NonPublicAccessibilityModifier */) {
           error(accessNode, Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, unescapeLeadingUnderscores(propertyName));
           return errorType;

package/lib/tsserver.js

@@ -1231,6 +1231,7 @@ __export(server_exports, {
   isBindingOrAssignmentPattern: () => isBindingOrAssignmentPattern,
   isBindingPattern: () => isBindingPattern,
   isBlock: () => isBlock,
+  isBlockLike: () => isBlockLike,
   isBlockOrCatchScoped: () => isBlockOrCatchScoped,
   isBlockScope: () => isBlockScope,
   isBlockScopedContainerTopLevel: () => isBlockScopedContainerTopLevel,
@@ -2339,8 +2340,8 @@ __export(server_exports, {
 module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
-var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240216`;
+var versionMajorMinor = "5.5";
+var version = `${versionMajorMinor}.0-insiders.20240221`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6732,6 +6733,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
   ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";
   ObjectFlags3[ObjectFlags3["InstantiationExpressionType"] = 8388608] = "InstantiationExpressionType";
+  ObjectFlags3[ObjectFlags3["SingleSignatureType"] = 134217728] = "SingleSignatureType";
   ObjectFlags3[ObjectFlags3["IsClassInstanceClone"] = 16777216] = "IsClassInstanceClone";
   ObjectFlags3[ObjectFlags3["IdenticalBaseTypeCalculated"] = 33554432] = "IdenticalBaseTypeCalculated";
   ObjectFlags3[ObjectFlags3["IdenticalBaseTypeExists"] = 67108864] = "IdenticalBaseTypeExists";
@@ -53518,7 +53520,7 @@ function createTypeChecker(host) {
         }
         const abstractSignatures = filter(resolved.constructSignatures, (signature) => !!(signature.flags & 4 /* Abstract */));
         if (some(abstractSignatures)) {
-          const types = map(abstractSignatures, getOrCreateTypeFromSignature);
+          const types = map(abstractSignatures, (s) => getOrCreateTypeFromSignature(s));
           const typeElementCount = resolved.callSignatures.length + (resolved.constructSignatures.length - abstractSignatures.length) + resolved.indexInfos.length + // exclude `prototype` when writing a class expression as a type literal, as per
           // the logic in `createTypeNodesFromResolvedType`.
           (context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */ ? countWhere(resolved.properties, (p) => !(p.flags & 4194304 /* Prototype */)) : length(resolved.properties));
@@ -60059,11 +60061,15 @@ function createTypeChecker(host) {
     return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
   }
   function getResolvedApparentTypeOfMappedType(type) {
-    const typeVariable = getHomomorphicTypeVariable(type);
-    if (typeVariable && !type.declaration.nameType) {
-      const constraint = getConstraintOfTypeParameter(typeVariable);
-      if (constraint && everyType(constraint, isArrayOrTupleType)) {
-        return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+    const target = type.target ?? type;
+    const typeVariable = getHomomorphicTypeVariable(target);
+    if (typeVariable && !target.declaration.nameType) {
+      const constraint = getConstraintTypeFromMappedType(type);
+      if (constraint.flags & 4194304 /* Index */) {
+        const baseConstraint = getBaseConstraintOfType(constraint.type);
+        if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+          return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+        }
       }
     }
     return type;
@@ -60908,6 +60914,12 @@ function createTypeChecker(host) {
       isInJSFile(signature.declaration)
     );
   }
+  function getImplementationSignature(signature) {
+    return signature.typeParameters ? signature.implementationSignatureCache || (signature.implementationSignatureCache = createImplementationSignature(signature)) : signature;
+  }
+  function createImplementationSignature(signature) {
+    return signature.typeParameters ? instantiateSignature(signature, createTypeMapper([], [])) : signature;
+  }
   function getBaseSignature(signature) {
     const typeParameters = signature.typeParameters;
     if (typeParameters) {
@@ -60930,12 +60942,22 @@ function createTypeChecker(host) {
     }
     return signature;
   }
-  function getOrCreateTypeFromSignature(signature) {
+  function getOrCreateTypeFromSignature(signature, outerTypeParameters) {
     var _a;
     if (!signature.isolatedSignatureType) {
       const kind = (_a = signature.declaration) == null ? void 0 : _a.kind;
       const isConstructor = kind === void 0 || kind === 176 /* Constructor */ || kind === 180 /* ConstructSignature */ || kind === 185 /* ConstructorType */;
-      const type = createObjectType(16 /* Anonymous */);
+      const type = createObjectType(16 /* Anonymous */ | 134217728 /* SingleSignatureType */, createSymbol(16 /* Function */, "__function" /* Function */));
+      if (signature.declaration && !nodeIsSynthesized(signature.declaration)) {
+        type.symbol.declarations = [signature.declaration];
+        type.symbol.valueDeclaration = signature.declaration;
+      }
+      outerTypeParameters || (outerTypeParameters = signature.declaration && getOuterTypeParameters(
+        signature.declaration,
+        /*includeThisTypes*/
+        true
+      ));
+      type.outerTypeParameters = outerTypeParameters;
       type.members = emptySymbols;
       type.properties = emptyArray;
       type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -62102,7 +62124,7 @@ function createTypeChecker(host) {
     return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
   }
   function createNormalizedTupleType(target, elementTypes) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!(target.combinedFlags & 14 /* NonRequired */)) {
       return createTypeReference(target, elementTypes);
     }
@@ -62122,8 +62144,10 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-          addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        if (type.flags & 1 /* Any */) {
+          addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+          addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
         } else if (isTupleType(type)) {
           const elements = getElementTypes(type);
           if (elements.length + expandedTypes.length >= 1e4) {
@@ -62138,10 +62162,10 @@ function createTypeChecker(host) {
             return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
           });
         } else {
-          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
         }
       } else {
-        addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+        addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
       }
     }
     for (let i = 0; i < lastRequiredIndex; i++) {
@@ -63505,10 +63529,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function maybeCloneTypeParameter(p) {
-    const constraint = getConstraintOfTypeParameter(p);
-    return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-  }
   function isSimpleTupleType(node) {
     return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
   }
@@ -63538,27 +63558,19 @@ function createTypeChecker(host) {
       const checkTypeDeferred = isDeferredType(checkType, checkTuples);
       let combinedMapper;
       if (root.inferTypeParameters) {
-        const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-        const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
         const context = createInferenceContext(
-          freshParams,
+          root.inferTypeParameters,
           /*signature*/
           void 0,
           0 /* None */
         );
-        if (freshMapper) {
-          const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (let i = 0; i < freshParams.length; i++) {
-            if (freshParams[i] !== root.inferTypeParameters[i]) {
-              freshParams[i].mapper = freshCombinedMapper;
-            }
-          }
+        if (mapper) {
+          context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
-        const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-        combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+        combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
       const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
       if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -64338,7 +64350,7 @@ function createTypeChecker(host) {
     const declaration = type.objectFlags & 4 /* Reference */ ? type.node : type.objectFlags & 8388608 /* InstantiationExpressionType */ ? type.node : type.symbol.declarations[0];
     const links = getNodeLinks(declaration);
     const target = type.objectFlags & 4 /* Reference */ ? links.resolvedType : type.objectFlags & 64 /* Instantiated */ ? type.target : type;
-    let typeParameters = links.outerTypeParameters;
+    let typeParameters = type.objectFlags & 134217728 /* SingleSignatureType */ ? type.outerTypeParameters : links.outerTypeParameters;
     if (!typeParameters) {
       let outerTypeParameters = getOuterTypeParameters(
         declaration,
@@ -64519,6 +64531,9 @@ function createTypeChecker(host) {
     if (type.objectFlags & 8388608 /* InstantiationExpressionType */) {
       result.node = type.node;
     }
+    if (type.objectFlags & 134217728 /* SingleSignatureType */) {
+      result.outerTypeParameters = type.outerTypeParameters;
+    }
     result.target = type;
     result.mapper = mapper;
     result.aliasSymbol = aliasSymbol || type.aliasSymbol;
@@ -65410,8 +65425,8 @@ function createTypeChecker(host) {
     const paramCount = sourceRestType || targetRestType ? Math.min(sourceCount, targetCount) : Math.max(sourceCount, targetCount);
     const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
     for (let i = 0; i < paramCount; i++) {
-      const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-      const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
+      const sourceType = i === restIndex ? getRestOrAnyTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
+      const targetType = i === restIndex ? getRestOrAnyTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
       if (sourceType && targetType) {
         const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
         const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -69139,7 +69154,7 @@ function createTypeChecker(host) {
     if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
       return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
     }
-    const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
+    const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 134217728 /* SingleSignatureType */ && !!length(type.outerTypeParameters) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
     if (type.flags & 3899393 /* ObjectFlagsType */) {
       type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0);
     }
@@ -69421,6 +69436,9 @@ function createTypeChecker(host) {
       pos = p;
     }
   }
+  function isTupleOfSelf(typeParameter, type) {
+    return isTupleType(type) && getTupleElementType(type, 0) === getIndexedAccessType(typeParameter, getNumberLiteralType(0)) && !getTypeOfPropertyOfType(type, "1");
+  }
   function inferTypes(inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
     let bivariant = false;
     let propagationType;
@@ -69506,6 +69524,9 @@ function createTypeChecker(host) {
               inference.priority = priority;
             }
             if (priority === inference.priority) {
+              if (isTupleOfSelf(inference.typeParameter, candidate)) {
+                return;
+              }
               if (contravariant && !bivariant) {
                 if (!contains(inference.contraCandidates, candidate)) {
                   inference.contraCandidates = append(inference.contraCandidates, candidate);
@@ -70072,9 +70093,7 @@ function createTypeChecker(host) {
           inferredType = silentNeverType;
         } else {
           const defaultType = getDefaultFromTypeParameter(inference.typeParameter);
-          if (defaultType) {
-            inferredType = instantiateType(defaultType, mergeTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
-          }
+          inferredType = instantiateType(defaultType, mergeTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
         }
       } else {
         inferredType = getTypeFromInference(inference);
@@ -76462,7 +76481,7 @@ function createTypeChecker(host) {
           void 0,
           checkMode
         );
-        const checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
+        const checkArgType = instantiateType(checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType, signature.mapper);
         const effectiveCheckArgumentNode = getEffectiveCheckNode(arg);
         if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors2 ? effectiveCheckArgumentNode : void 0, effectiveCheckArgumentNode, headMessage, containingMessageChain, errorOutputContainer)) {
           Debug.assert(!reportErrors2 || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
@@ -77006,13 +77025,16 @@ function createTypeChecker(host) {
         return candidate;
       }
       for (let candidateIndex = 0; candidateIndex < candidates2.length; candidateIndex++) {
-        const candidate = candidates2[candidateIndex];
+        let candidate = candidates2[candidateIndex];
         if (!hasCorrectTypeArgumentArity(candidate, typeArguments) || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma2)) {
           continue;
         }
         let checkCandidate;
         let inferenceContext;
         if (candidate.typeParameters) {
+          if (candidate.declaration && findAncestor(node, (a) => a === candidate.declaration)) {
+            candidate = getImplementationSignature(candidate);
+          }
           let typeArgumentTypes;
           if (some(typeArguments)) {
             typeArgumentTypes = checkTypeArguments(
@@ -77032,7 +77054,7 @@ function createTypeChecker(host) {
               /*flags*/
               isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */
             );
-            typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
+            typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext), inferenceContext.nonFixingMapper);
             argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
           }
           checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
@@ -77060,7 +77082,7 @@ function createTypeChecker(host) {
         if (argCheckMode) {
           argCheckMode = 0 /* Normal */;
           if (inferenceContext) {
-            const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
+            const typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext), inferenceContext.mapper);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
             if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma2)) {
               candidateForArgumentArityError = checkCandidate;
@@ -78414,6 +78436,11 @@ function createTypeChecker(host) {
     }
     return createTupleType(types, flags, readonly, names);
   }
+  function getRestOrAnyTypeAtPosition(source, pos) {
+    const restType = getRestTypeAtPosition(source, pos);
+    const elementType = restType && getElementTypeOfArrayType(restType);
+    return elementType && isTypeAny(elementType) ? anyType : restType;
+  }
   function getParameterCount(signature) {
     const length2 = signature.parameters.length;
     if (signatureHasRestParameter(signature)) {
@@ -78470,7 +78497,7 @@ function createTypeChecker(host) {
     if (signatureHasRestParameter(signature)) {
       const restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
       if (!isTupleType(restType)) {
-        return restType;
+        return isTypeAny(restType) ? anyArrayType : restType;
       }
       if (restType.target.hasRestElement) {
         return sliceTupleType(restType, restType.target.fixedLength);
@@ -80772,7 +80799,7 @@ function createTypeChecker(host) {
                 }
               }
             }
-            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
+            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context), flatMap(inferenceContexts, (c) => c && map(c.inferences, (i) => i.typeParameter)).slice());
           }
         }
       }
@@ -81774,20 +81801,17 @@ function createTypeChecker(host) {
     const objectType = type.objectType;
     const indexType = type.indexType;
     const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === 2 /* Remapping */ ? getIndexTypeForMappedType(objectType, 0 /* None */) : getIndexType(objectType, 0 /* None */);
-    if (isTypeAssignableTo(indexType, objectIndexType)) {
+    const hasNumberIndexInfo = !!getIndexInfoOfType(objectType, numberType);
+    if (everyType(indexType, (t) => isTypeAssignableTo(t, objectIndexType) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
       if (accessNode.kind === 212 /* ElementAccessExpression */ && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
         error2(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
       }
       return type;
     }
-    const apparentObjectType = getApparentType(objectType);
-    if (getIndexInfoOfType(apparentObjectType, numberType) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
-      return type;
-    }
     if (isGenericObjectType(objectType)) {
       const propertyName = getPropertyNameFromIndex(indexType, accessNode);
       if (propertyName) {
-        const propertySymbol = forEachType(apparentObjectType, (t) => getPropertyOfType(t, propertyName));
+        const propertySymbol = forEachType(getApparentType(objectType), (t) => getPropertyOfType(t, propertyName));
         if (propertySymbol && getDeclarationModifierFlagsFromSymbol(propertySymbol) & 6 /* NonPublicAccessibilityModifier */) {
           error2(accessNode, Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, unescapeLeadingUnderscores(propertyName));
           return errorType;
@@ -135474,6 +135498,17 @@ function fileShouldUseJavaScriptRequire(file, program, host, preferRequire) {
   }
   return preferRequire;
 }
+function isBlockLike(node) {
+  switch (node.kind) {
+    case 241 /* Block */:
+    case 312 /* SourceFile */:
+    case 268 /* ModuleBlock */:
+    case 296 /* CaseClause */:
+      return true;
+    default:
+      return false;
+  }
+}
 
 // src/services/exportInfoMap.ts
 var ImportKind = /* @__PURE__ */ ((ImportKind2) => {
@@ -140823,6 +140858,14 @@ registerRefactor(refactorNameForMoveToFile, {
     if (!interactiveRefactorArguments) {
       return emptyArray;
     }
+    if (context.endPosition !== void 0) {
+      const file = context.file;
+      const startNodeAncestor = findAncestor(getTokenAtPosition(file, context.startPosition), isBlockLike);
+      const endNodeAncestor = findAncestor(getTokenAtPosition(file, context.endPosition), isBlockLike);
+      if (startNodeAncestor && !isSourceFile(startNodeAncestor) && endNodeAncestor && !isSourceFile(endNodeAncestor)) {
+        return emptyArray;
+      }
+    }
     if (context.preferences.allowTextChangesInNewFiles && statements) {
       return [{ name: refactorNameForMoveToFile, description: description2, actions: [moveToFileAction] }];
     }
@@ -144900,17 +144943,6 @@ function isExtractableExpression(node) {
   }
   return true;
 }
-function isBlockLike(node) {
-  switch (node.kind) {
-    case 241 /* Block */:
-    case 312 /* SourceFile */:
-    case 268 /* ModuleBlock */:
-    case 296 /* CaseClause */:
-      return true;
-    default:
-      return false;
-  }
-}
 function isInJSXContent(node) {
   return isStringLiteralJsxAttribute(node) || (isJsxElement(node) || isJsxSelfClosingElement(node) || isJsxFragment(node)) && (isJsxElement(node.parent) || isJsxFragment(node.parent));
 }
@@ -175660,6 +175692,7 @@ __export(ts_exports2, {
   isBindingOrAssignmentPattern: () => isBindingOrAssignmentPattern,
   isBindingPattern: () => isBindingPattern,
   isBlock: () => isBlock,
+  isBlockLike: () => isBlockLike,
   isBlockOrCatchScoped: () => isBlockOrCatchScoped,
   isBlockScope: () => isBlockScope,
   isBlockScopedContainerTopLevel: () => isBlockScopedContainerTopLevel,
@@ -190484,6 +190517,7 @@ start(initializeNodeSystem(), require("os").platform());
   isBindingOrAssignmentPattern,
   isBindingPattern,
   isBlock,
+  isBlockLike,
   isBlockOrCatchScoped,
   isBlockScope,
   isBlockScopedContainerTopLevel,

package/lib/typescript.d.ts

@@ -4139,7 +4139,7 @@ declare namespace ts {
             responseRequired?: boolean;
         }
     }
-    const versionMajorMinor = "5.4";
+    const versionMajorMinor = "5.5";
     /** The version of the TypeScript compiler release */
     const version: string;
     /**
@@ -7242,6 +7242,7 @@ declare namespace ts {
         ContainsSpread = 2097152,
         ObjectRestType = 4194304,
         InstantiationExpressionType = 8388608,
+        SingleSignatureType = 134217728,
     }
     interface ObjectType extends Type {
         objectFlags: ObjectFlags;

package/lib/typescript.js

@@ -34,8 +34,8 @@ var ts = (() => {
   var init_corePublic = __esm({
     "src/compiler/corePublic.ts"() {
       "use strict";
-      versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-insiders.20240216`;
+      versionMajorMinor = "5.5";
+      version = `${versionMajorMinor}.0-insiders.20240221`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4485,6 +4485,7 @@ ${lanes.join("\n")}
         ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
         ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";
         ObjectFlags3[ObjectFlags3["InstantiationExpressionType"] = 8388608] = "InstantiationExpressionType";
+        ObjectFlags3[ObjectFlags3["SingleSignatureType"] = 134217728] = "SingleSignatureType";
         ObjectFlags3[ObjectFlags3["IsClassInstanceClone"] = 16777216] = "IsClassInstanceClone";
         ObjectFlags3[ObjectFlags3["IdenticalBaseTypeCalculated"] = 33554432] = "IdenticalBaseTypeCalculated";
         ObjectFlags3[ObjectFlags3["IdenticalBaseTypeExists"] = 67108864] = "IdenticalBaseTypeExists";
@@ -51273,7 +51274,7 @@ ${lanes.join("\n")}
           }
           const abstractSignatures = filter(resolved.constructSignatures, (signature) => !!(signature.flags & 4 /* Abstract */));
           if (some(abstractSignatures)) {
-            const types = map(abstractSignatures, getOrCreateTypeFromSignature);
+            const types = map(abstractSignatures, (s) => getOrCreateTypeFromSignature(s));
             const typeElementCount = resolved.callSignatures.length + (resolved.constructSignatures.length - abstractSignatures.length) + resolved.indexInfos.length + // exclude `prototype` when writing a class expression as a type literal, as per
             // the logic in `createTypeNodesFromResolvedType`.
             (context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */ ? countWhere(resolved.properties, (p) => !(p.flags & 4194304 /* Prototype */)) : length(resolved.properties));
@@ -57814,11 +57815,15 @@ ${lanes.join("\n")}
       return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
     }
     function getResolvedApparentTypeOfMappedType(type) {
-      const typeVariable = getHomomorphicTypeVariable(type);
-      if (typeVariable && !type.declaration.nameType) {
-        const constraint = getConstraintOfTypeParameter(typeVariable);
-        if (constraint && everyType(constraint, isArrayOrTupleType)) {
-          return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+      const target = type.target ?? type;
+      const typeVariable = getHomomorphicTypeVariable(target);
+      if (typeVariable && !target.declaration.nameType) {
+        const constraint = getConstraintTypeFromMappedType(type);
+        if (constraint.flags & 4194304 /* Index */) {
+          const baseConstraint = getBaseConstraintOfType(constraint.type);
+          if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+            return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+          }
         }
       }
       return type;
@@ -58663,6 +58668,12 @@ ${lanes.join("\n")}
         isInJSFile(signature.declaration)
       );
     }
+    function getImplementationSignature(signature) {
+      return signature.typeParameters ? signature.implementationSignatureCache || (signature.implementationSignatureCache = createImplementationSignature(signature)) : signature;
+    }
+    function createImplementationSignature(signature) {
+      return signature.typeParameters ? instantiateSignature(signature, createTypeMapper([], [])) : signature;
+    }
     function getBaseSignature(signature) {
       const typeParameters = signature.typeParameters;
       if (typeParameters) {
@@ -58685,12 +58696,22 @@ ${lanes.join("\n")}
       }
       return signature;
     }
-    function getOrCreateTypeFromSignature(signature) {
+    function getOrCreateTypeFromSignature(signature, outerTypeParameters) {
       var _a;
       if (!signature.isolatedSignatureType) {
         const kind = (_a = signature.declaration) == null ? void 0 : _a.kind;
         const isConstructor = kind === void 0 || kind === 176 /* Constructor */ || kind === 180 /* ConstructSignature */ || kind === 185 /* ConstructorType */;
-        const type = createObjectType(16 /* Anonymous */);
+        const type = createObjectType(16 /* Anonymous */ | 134217728 /* SingleSignatureType */, createSymbol(16 /* Function */, "__function" /* Function */));
+        if (signature.declaration && !nodeIsSynthesized(signature.declaration)) {
+          type.symbol.declarations = [signature.declaration];
+          type.symbol.valueDeclaration = signature.declaration;
+        }
+        outerTypeParameters || (outerTypeParameters = signature.declaration && getOuterTypeParameters(
+          signature.declaration,
+          /*includeThisTypes*/
+          true
+        ));
+        type.outerTypeParameters = outerTypeParameters;
         type.members = emptySymbols;
         type.properties = emptyArray;
         type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -59857,7 +59878,7 @@ ${lanes.join("\n")}
       return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
     }
     function createNormalizedTupleType(target, elementTypes) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       if (!(target.combinedFlags & 14 /* NonRequired */)) {
         return createTypeReference(target, elementTypes);
       }
@@ -59877,8 +59898,10 @@ ${lanes.join("\n")}
         const type = elementTypes[i];
         const flags = target.elementFlags[i];
         if (flags & 8 /* Variadic */) {
-          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-            addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+          if (type.flags & 1 /* Any */) {
+            addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+          } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+            addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
           } else if (isTupleType(type)) {
             const elements = getElementTypes(type);
             if (elements.length + expandedTypes.length >= 1e4) {
@@ -59893,10 +59916,10 @@ ${lanes.join("\n")}
               return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
             });
           } else {
-            addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+            addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
           }
         } else {
-          addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+          addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
         }
       }
       for (let i = 0; i < lastRequiredIndex; i++) {
@@ -61260,10 +61283,6 @@ ${lanes.join("\n")}
       }
       return type;
     }
-    function maybeCloneTypeParameter(p) {
-      const constraint = getConstraintOfTypeParameter(p);
-      return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-    }
     function isSimpleTupleType(node) {
       return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
     }
@@ -61293,27 +61312,19 @@ ${lanes.join("\n")}
         const checkTypeDeferred = isDeferredType(checkType, checkTuples);
         let combinedMapper;
         if (root.inferTypeParameters) {
-          const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-          const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
           const context = createInferenceContext(
-            freshParams,
+            root.inferTypeParameters,
             /*signature*/
             void 0,
             0 /* None */
           );
-          if (freshMapper) {
-            const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-            for (let i = 0; i < freshParams.length; i++) {
-              if (freshParams[i] !== root.inferTypeParameters[i]) {
-                freshParams[i].mapper = freshCombinedMapper;
-              }
-            }
+          if (mapper) {
+            context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
           }
           if (!checkTypeDeferred) {
-            inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+            inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
           }
-          const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-          combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+          combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
         }
         const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
         if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -62093,7 +62104,7 @@ ${lanes.join("\n")}
       const declaration = type.objectFlags & 4 /* Reference */ ? type.node : type.objectFlags & 8388608 /* InstantiationExpressionType */ ? type.node : type.symbol.declarations[0];
       const links = getNodeLinks(declaration);
       const target = type.objectFlags & 4 /* Reference */ ? links.resolvedType : type.objectFlags & 64 /* Instantiated */ ? type.target : type;
-      let typeParameters = links.outerTypeParameters;
+      let typeParameters = type.objectFlags & 134217728 /* SingleSignatureType */ ? type.outerTypeParameters : links.outerTypeParameters;
       if (!typeParameters) {
         let outerTypeParameters = getOuterTypeParameters(
           declaration,
@@ -62274,6 +62285,9 @@ ${lanes.join("\n")}
       if (type.objectFlags & 8388608 /* InstantiationExpressionType */) {
         result.node = type.node;
       }
+      if (type.objectFlags & 134217728 /* SingleSignatureType */) {
+        result.outerTypeParameters = type.outerTypeParameters;
+      }
       result.target = type;
       result.mapper = mapper;
       result.aliasSymbol = aliasSymbol || type.aliasSymbol;
@@ -63165,8 +63179,8 @@ ${lanes.join("\n")}
       const paramCount = sourceRestType || targetRestType ? Math.min(sourceCount, targetCount) : Math.max(sourceCount, targetCount);
       const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
       for (let i = 0; i < paramCount; i++) {
-        const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-        const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
+        const sourceType = i === restIndex ? getRestOrAnyTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
+        const targetType = i === restIndex ? getRestOrAnyTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
         if (sourceType && targetType) {
           const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
           const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -66894,7 +66908,7 @@ ${lanes.join("\n")}
       if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
         return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
       }
-      const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
+      const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 134217728 /* SingleSignatureType */ && !!length(type.outerTypeParameters) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
       if (type.flags & 3899393 /* ObjectFlagsType */) {
         type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0);
       }
@@ -67176,6 +67190,9 @@ ${lanes.join("\n")}
         pos = p;
       }
     }
+    function isTupleOfSelf(typeParameter, type) {
+      return isTupleType(type) && getTupleElementType(type, 0) === getIndexedAccessType(typeParameter, getNumberLiteralType(0)) && !getTypeOfPropertyOfType(type, "1");
+    }
     function inferTypes(inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
       let bivariant = false;
       let propagationType;
@@ -67261,6 +67278,9 @@ ${lanes.join("\n")}
                 inference.priority = priority;
               }
               if (priority === inference.priority) {
+                if (isTupleOfSelf(inference.typeParameter, candidate)) {
+                  return;
+                }
                 if (contravariant && !bivariant) {
                   if (!contains(inference.contraCandidates, candidate)) {
                     inference.contraCandidates = append(inference.contraCandidates, candidate);
@@ -67827,9 +67847,7 @@ ${lanes.join("\n")}
             inferredType = silentNeverType;
           } else {
             const defaultType = getDefaultFromTypeParameter(inference.typeParameter);
-            if (defaultType) {
-              inferredType = instantiateType(defaultType, mergeTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
-            }
+            inferredType = instantiateType(defaultType, mergeTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
           }
         } else {
           inferredType = getTypeFromInference(inference);
@@ -74217,7 +74235,7 @@ ${lanes.join("\n")}
             void 0,
             checkMode
           );
-          const checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
+          const checkArgType = instantiateType(checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType, signature.mapper);
           const effectiveCheckArgumentNode = getEffectiveCheckNode(arg);
           if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors2 ? effectiveCheckArgumentNode : void 0, effectiveCheckArgumentNode, headMessage, containingMessageChain, errorOutputContainer)) {
             Debug.assert(!reportErrors2 || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
@@ -74761,13 +74779,16 @@ ${lanes.join("\n")}
           return candidate;
         }
         for (let candidateIndex = 0; candidateIndex < candidates2.length; candidateIndex++) {
-          const candidate = candidates2[candidateIndex];
+          let candidate = candidates2[candidateIndex];
           if (!hasCorrectTypeArgumentArity(candidate, typeArguments) || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma2)) {
             continue;
           }
           let checkCandidate;
           let inferenceContext;
           if (candidate.typeParameters) {
+            if (candidate.declaration && findAncestor(node, (a) => a === candidate.declaration)) {
+              candidate = getImplementationSignature(candidate);
+            }
             let typeArgumentTypes;
             if (some(typeArguments)) {
               typeArgumentTypes = checkTypeArguments(
@@ -74787,7 +74808,7 @@ ${lanes.join("\n")}
                 /*flags*/
                 isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */
               );
-              typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
+              typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext), inferenceContext.nonFixingMapper);
               argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
             }
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
@@ -74815,7 +74836,7 @@ ${lanes.join("\n")}
           if (argCheckMode) {
             argCheckMode = 0 /* Normal */;
             if (inferenceContext) {
-              const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
+              const typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext), inferenceContext.mapper);
               checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
               if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma2)) {
                 candidateForArgumentArityError = checkCandidate;
@@ -76169,6 +76190,11 @@ ${lanes.join("\n")}
       }
       return createTupleType(types, flags, readonly, names);
     }
+    function getRestOrAnyTypeAtPosition(source, pos) {
+      const restType = getRestTypeAtPosition(source, pos);
+      const elementType = restType && getElementTypeOfArrayType(restType);
+      return elementType && isTypeAny(elementType) ? anyType : restType;
+    }
     function getParameterCount(signature) {
       const length2 = signature.parameters.length;
       if (signatureHasRestParameter(signature)) {
@@ -76225,7 +76251,7 @@ ${lanes.join("\n")}
       if (signatureHasRestParameter(signature)) {
         const restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
         if (!isTupleType(restType)) {
-          return restType;
+          return isTypeAny(restType) ? anyArrayType : restType;
         }
         if (restType.target.hasRestElement) {
           return sliceTupleType(restType, restType.target.fixedLength);
@@ -78527,7 +78553,7 @@ ${lanes.join("\n")}
                   }
                 }
               }
-              return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
+              return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context), flatMap(inferenceContexts, (c) => c && map(c.inferences, (i) => i.typeParameter)).slice());
             }
           }
         }
@@ -79529,20 +79555,17 @@ ${lanes.join("\n")}
       const objectType = type.objectType;
       const indexType = type.indexType;
       const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === 2 /* Remapping */ ? getIndexTypeForMappedType(objectType, 0 /* None */) : getIndexType(objectType, 0 /* None */);
-      if (isTypeAssignableTo(indexType, objectIndexType)) {
+      const hasNumberIndexInfo = !!getIndexInfoOfType(objectType, numberType);
+      if (everyType(indexType, (t) => isTypeAssignableTo(t, objectIndexType) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
         if (accessNode.kind === 212 /* ElementAccessExpression */ && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
           error2(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
         }
         return type;
       }
-      const apparentObjectType = getApparentType(objectType);
-      if (getIndexInfoOfType(apparentObjectType, numberType) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
-        return type;
-      }
       if (isGenericObjectType(objectType)) {
         const propertyName = getPropertyNameFromIndex(indexType, accessNode);
         if (propertyName) {
-          const propertySymbol = forEachType(apparentObjectType, (t) => getPropertyOfType(t, propertyName));
+          const propertySymbol = forEachType(getApparentType(objectType), (t) => getPropertyOfType(t, propertyName));
           if (propertySymbol && getDeclarationModifierFlagsFromSymbol(propertySymbol) & 6 /* NonPublicAccessibilityModifier */) {
             error2(accessNode, Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, unescapeLeadingUnderscores(propertyName));
             return errorType;
@@ -133721,6 +133744,17 @@ ${lanes.join("\n")}
     }
     return preferRequire;
   }
+  function isBlockLike(node) {
+    switch (node.kind) {
+      case 241 /* Block */:
+      case 312 /* SourceFile */:
+      case 268 /* ModuleBlock */:
+      case 296 /* CaseClause */:
+        return true;
+      default:
+        return false;
+    }
+  }
   var scanner, SemanticMeaning, tripleSlashDirectivePrefixRegex, typeKeywords, QuotePreference, displayPartWriter, lineFeed2, ANONYMOUS, syntaxMayBeASICandidate;
   var init_utilities4 = __esm({
     "src/services/utilities.ts"() {
@@ -140166,6 +140200,14 @@ ${lanes.join("\n")}
           if (!interactiveRefactorArguments) {
             return emptyArray;
           }
+          if (context.endPosition !== void 0) {
+            const file = context.file;
+            const startNodeAncestor = findAncestor(getTokenAtPosition(file, context.startPosition), isBlockLike);
+            const endNodeAncestor = findAncestor(getTokenAtPosition(file, context.endPosition), isBlockLike);
+            if (startNodeAncestor && !isSourceFile(startNodeAncestor) && endNodeAncestor && !isSourceFile(endNodeAncestor)) {
+              return emptyArray;
+            }
+          }
           if (context.preferences.allowTextChangesInNewFiles && statements) {
             return [{ name: refactorNameForMoveToFile, description: description2, actions: [moveToFileAction] }];
           }
@@ -143325,17 +143367,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     return true;
   }
-  function isBlockLike(node) {
-    switch (node.kind) {
-      case 241 /* Block */:
-      case 312 /* SourceFile */:
-      case 268 /* ModuleBlock */:
-      case 296 /* CaseClause */:
-        return true;
-      default:
-        return false;
-    }
-  }
   function isInJSXContent(node) {
     return isStringLiteralJsxAttribute(node) || (isJsxElement(node) || isJsxSelfClosingElement(node) || isJsxFragment(node)) && (isJsxElement(node.parent) || isJsxFragment(node.parent));
   }
@@ -187246,6 +187277,7 @@ ${e.message}`;
     isBindingOrAssignmentPattern: () => isBindingOrAssignmentPattern,
     isBindingPattern: () => isBindingPattern,
     isBlock: () => isBlock,
+    isBlockLike: () => isBlockLike,
     isBlockOrCatchScoped: () => isBlockOrCatchScoped,
     isBlockScope: () => isBlockScope,
     isBlockScopedContainerTopLevel: () => isBlockScopedContainerTopLevel,
@@ -189667,6 +189699,7 @@ ${e.message}`;
     isBindingOrAssignmentPattern: () => isBindingOrAssignmentPattern,
     isBindingPattern: () => isBindingPattern,
     isBlock: () => isBlock,
+    isBlockLike: () => isBlockLike,
     isBlockOrCatchScoped: () => isBlockOrCatchScoped,
     isBlockScope: () => isBlockScope,
     isBlockScopedContainerTopLevel: () => isBlockScopedContainerTopLevel,

package/lib/typingsInstaller.js

@@ -53,8 +53,8 @@ var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
-var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20240216`;
+var versionMajorMinor = "5.5";
+var version = `${versionMajorMinor}.0-insiders.20240221`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3142,6 +3142,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
   ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";
   ObjectFlags3[ObjectFlags3["InstantiationExpressionType"] = 8388608] = "InstantiationExpressionType";
+  ObjectFlags3[ObjectFlags3["SingleSignatureType"] = 134217728] = "SingleSignatureType";
   ObjectFlags3[ObjectFlags3["IsClassInstanceClone"] = 16777216] = "IsClassInstanceClone";
   ObjectFlags3[ObjectFlags3["IdenticalBaseTypeCalculated"] = 33554432] = "IdenticalBaseTypeCalculated";
   ObjectFlags3[ObjectFlags3["IdenticalBaseTypeExists"] = 67108864] = "IdenticalBaseTypeExists";

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.4.0-pr-57394-2",
+  "version": "5.5.0-pr-57403-12",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "ec97d1f0fe2ad4412ae48e3ac505991132949036"
+  "gitHead": "70338f99ff0955fde9fe29b360c4bd685ac8d868"
 }