@zzzen/pyright-internal 1.2.0-dev.20230528 → 1.2.0-dev.20230604

package/dist/analyzer/typeUtils.js

@@ -8,14 +8,15 @@
  * Functions that operate on Type objects.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbolsRecursive = exports.getProtocolSymbols = exports.transformExpectedType = exports.validateTypeVarDefault = exports.applyInScopePlaceholders = exports.applySourceContextTypeVarsToSignature = exports.applySourceContextTypeVars = exports.applySolvedTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isCallableType = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.containsType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.getTypeVarScopeIds = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSubtype = exports.sortTypes = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.isOptionalType = exports.UniqueSignatureTracker = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
-exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsUnknown = exports.containsAnyOrUnknown = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.isInstantiableMetaclass = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.isTypeVarLimitedToCallable = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = exports.lookUpClassMember = void 0;
+exports.lookUpClassMember = exports.lookUpObjectMember = exports.getContainerDepth = exports.getProtocolSymbolsRecursive = exports.getProtocolSymbols = exports.transformExpectedType = exports.validateTypeVarDefault = exports.applyInScopePlaceholders = exports.applySourceContextTypeVarsToSignature = exports.applySourceContextTypeVars = exports.applySolvedTypeVars = exports.ensureFunctionSignaturesAreUnique = exports.populateTypeVarContextForSelfType = exports.partiallySpecializeType = exports.isUnboundedTupleClass = exports.isTupleClass = exports.isMaybeDescriptorInstance = exports.isDescriptorInstance = exports.isCallableType = exports.isProperty = exports.isEllipsisType = exports.getUnionSubtypeCount = exports.getLiteralTypeClassName = exports.containsLiteralType = exports.isLiteralTypeOrUnion = exports.isLiteralType = exports.getSpecializedTupleType = exports.getTypeVarScopeIds = exports.getTypeVarScopeId = exports.transformPossibleRecursiveTypeAlias = exports.isTypeAliasRecursive = exports.isTypeAliasPlaceholder = exports.getTypeCondition = exports.addConditionToType = exports.getFullNameOfType = exports.derivesFromAnyOrUnknown = exports.isUnionableType = exports.preserveUnknown = exports.areTypesSame = exports.doForEachSubtype = exports.sortTypes = exports.mapSubtypes = exports.makeInferenceContext = exports.isTypeVarSame = exports.isIncompleteUnknown = exports.isOptionalType = exports.UniqueSignatureTracker = exports.AssignTypeFlags = exports.ClassIteratorFlags = exports.ClassMemberLookupFlags = void 0;
+exports.convertParamSpecValueToType = exports.convertTypeToParamSpecValue = exports.getDeclaringModulesForType = exports.computeMroLinearization = exports.isVarianceOfTypeArgumentCompatible = exports.combineVariances = exports.requiresSpecialization = exports.requiresTypeArguments = exports.getGeneratorTypeArgs = exports.removeParamSpecVariadicsFromFunction = exports.removeParamSpecVariadicsFromSignature = exports.getCommonErasedType = exports.specializeTupleClass = exports.combineSameSizedTuples = exports.explodeGenericClass = exports.isPartlyUnknown = exports.containsAnyOrUnknown = exports.getMembersForModule = exports.getMembersForClass = exports.convertToInstantiable = exports.convertToInstance = exports.isEffectivelyInstantiable = exports.isMetaclassInstance = exports.isInstantiableMetaclass = exports.getGeneratorYieldType = exports.getDeclaredGeneratorReturnType = exports.synthesizeTypeVarForSelfCls = exports.derivesFromClassRecursive = exports.specializeForBaseClass = exports.buildTypeVarContext = exports.buildTypeVarContextFromSpecializedClass = exports.setTypeArgumentsRecursive = exports.specializeClassType = exports.isTypeVarLimitedToCallable = exports.getTypeVarArgumentsRecursive = exports.addTypeVarsToListIfUnique = exports.getClassFieldsRecursive = exports.getClassIterator = exports.getClassMemberIterator = void 0;
 const collectionUtils_1 = require("../common/collectionUtils");
 const debug_1 = require("../common/debug");
 const symbol_1 = require("./symbol");
 const symbolUtils_1 = require("./symbolUtils");
 const types_1 = require("./types");
 const typeVarContext_1 = require("./typeVarContext");
+const typeWalker_1 = require("./typeWalker");
 var ClassMemberLookupFlags;
 (function (ClassMemberLookupFlags) {
     ClassMemberLookupFlags[ClassMemberLookupFlags["Default"] = 0] = "Default";
@@ -579,49 +580,28 @@ function isLiteralTypeOrUnion(type) {
     return false;
 }
 exports.isLiteralTypeOrUnion = isLiteralTypeOrUnion;
-function containsType(type, predicate, includeTypeArgs = false, recursionCount = 0) {
-    var _a;
-    if (recursionCount > types_1.maxTypeRecursionCount) {
-        return false;
-    }
-    recursionCount++;
-    if (predicate(type)) {
-        return true;
-    }
-    if (includeTypeArgs && (0, types_1.isClass)(type)) {
-        const typeArgs = ((_a = type.tupleTypeArguments) === null || _a === void 0 ? void 0 : _a.map((t) => t.type)) || type.typeArguments;
-        if (typeArgs) {
-            return typeArgs.some((typeArg) => containsType(typeArg, predicate, includeTypeArgs, recursionCount));
+function containsLiteralType(type, includeTypeArgs = false) {
+    class ContainsLiteralTypeWalker extends typeWalker_1.TypeWalker {
+        constructor(_includeTypeArgs) {
+            super();
+            this._includeTypeArgs = _includeTypeArgs;
+            this.foundLiteral = false;
         }
-    }
-    if ((0, types_1.isUnion)(type)) {
-        return type.subtypes.some((subtype) => containsType(subtype, predicate, includeTypeArgs, recursionCount));
-    }
-    if ((0, types_1.isOverloadedFunction)(type)) {
-        return type.overloads.some((overload) => containsType(overload, predicate, includeTypeArgs, recursionCount));
-    }
-    if ((0, types_1.isFunction)(type)) {
-        const returnType = types_1.FunctionType.getSpecializedReturnType(type);
-        if (returnType && containsType(returnType, predicate, includeTypeArgs, recursionCount)) {
-            return true;
-        }
-        for (let i = 0; i < type.details.parameters.length; i++) {
-            const paramType = types_1.FunctionType.getEffectiveParameterType(type, i);
-            if (containsType(paramType, predicate, includeTypeArgs, recursionCount)) {
-                return true;
+        visitClass(classType) {
+            if ((0, types_1.isClassInstance)(classType)) {
+                if (isLiteralType(classType) || types_1.ClassType.isBuiltIn(classType, 'LiteralString')) {
+                    this.foundLiteral = true;
+                    this.cancelWalk();
+                }
+            }
+            if (this._includeTypeArgs) {
+                super.visitClass(classType);
             }
         }
     }
-    return false;
-}
-exports.containsType = containsType;
-function containsLiteralType(type, includeTypeArgs = false, recursionCount = 0) {
-    return containsType(type, (t) => {
-        if (!(0, types_1.isClassInstance)(t)) {
-            return false;
-        }
-        return isLiteralType(t) || types_1.ClassType.isBuiltIn(t, 'LiteralString');
-    }, includeTypeArgs, recursionCount);
+    const walker = new ContainsLiteralTypeWalker(includeTypeArgs);
+    walker.walk(type);
+    return walker.foundLiteral;
 }
 exports.containsLiteralType = containsLiteralType;
 // If all of the subtypes are literals with the same built-in class (e.g.
@@ -841,8 +821,8 @@ exports.validateTypeVarDefault = validateTypeVarDefault;
 // expected type uses TypeVars that are not part of the context of the
 // class we are constructing. We'll replace these type variables with dummy
 // type variables.
-function transformExpectedType(expectedType, liveTypeVarScopes) {
-    const transformer = new ExpectedTypeTransformer(liveTypeVarScopes);
+function transformExpectedType(expectedType, liveTypeVarScopes, usageOffset) {
+    const transformer = new ExpectedTypeTransformer(liveTypeVarScopes, usageOffset);
     return transformer.apply(expectedType, 0);
 }
 exports.transformExpectedType = transformExpectedType;
@@ -1679,93 +1659,60 @@ function getMembersForModule(moduleType, symbolTable) {
     });
 }
 exports.getMembersForModule = getMembersForModule;
-// Determines if the type is an Any or Unknown or a union that
-// contains one of these. It does not look at type arguments.
-function containsAnyOrUnknown(type) {
-    let foundAnyOrUnknown = false;
-    doForEachSubtype(type, (subtype) => {
-        if ((0, types_1.isAnyOrUnknown)(subtype)) {
-            foundAnyOrUnknown = true;
+// Determines if the type contains an Any or Unknown type. If so,
+// it returns the Any or Unknown type. Unknowns are preferred over
+// Any if both are present. If recurse is true, it will recurse
+// through type arguments and parameters.
+function containsAnyOrUnknown(type, recurse) {
+    class AnyOrUnknownWalker extends typeWalker_1.TypeWalker {
+        constructor(_recurse) {
+            super();
+            this._recurse = _recurse;
         }
-    });
-    return foundAnyOrUnknown;
-}
-exports.containsAnyOrUnknown = containsAnyOrUnknown;
-// Determines if the type is an Unknown or a union that contains an Unknown.
-// It does not look at type arguments.
-function containsUnknown(type) {
-    let foundUnknown = false;
-    doForEachSubtype(type, (subtype) => {
-        if ((0, types_1.isUnknown)(subtype)) {
-            foundUnknown = true;
+        visitUnknown(type) {
+            this.anyOrUnknownType = this.anyOrUnknownType ? preserveUnknown(this.anyOrUnknownType, type) : type;
         }
-    });
-    return foundUnknown;
-}
-exports.containsUnknown = containsUnknown;
-// Determines if any part of the type contains "Unknown", including any type arguments.
-function isPartlyUnknown(type, allowUnknownTypeArgsForClasses = false, recursionCount = 0) {
-    var _a, _b;
-    if (recursionCount > types_1.maxTypeRecursionCount) {
-        return false;
-    }
-    recursionCount++;
-    if ((0, types_1.isUnknown)(type)) {
-        return true;
-    }
-    // If this is a generic type alias, see if any of its type arguments
-    // are either unspecified or are partially known.
-    if ((_a = type.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.typeArguments) {
-        if (type.typeAliasInfo.typeArguments.some((typeArg) => isPartlyUnknown(typeArg, allowUnknownTypeArgsForClasses, recursionCount))) {
-            return true;
+        visitAny(type) {
+            this.anyOrUnknownType = this.anyOrUnknownType ? preserveUnknown(this.anyOrUnknownType, type) : type;
         }
-    }
-    // See if a union contains an unknown type.
-    if ((0, types_1.isUnion)(type)) {
-        return ((0, types_1.findSubtype)(type, (subtype) => isPartlyUnknown(subtype, allowUnknownTypeArgsForClasses, recursionCount)) !==
-            undefined);
-    }
-    // See if an object or class has an unknown type argument.
-    if ((0, types_1.isClass)(type)) {
-        if (types_1.TypeBase.isInstance(type)) {
-            allowUnknownTypeArgsForClasses = false;
-        }
-        if (!allowUnknownTypeArgsForClasses && !types_1.ClassType.isPseudoGenericClass(type)) {
-            const typeArgs = ((_b = type.tupleTypeArguments) === null || _b === void 0 ? void 0 : _b.map((t) => t.type)) || type.typeArguments;
-            if (typeArgs) {
-                for (const argType of typeArgs) {
-                    if (isPartlyUnknown(argType, allowUnknownTypeArgsForClasses, recursionCount)) {
-                        return true;
-                    }
-                }
+        visitClass(type) {
+            if (this._recurse) {
+                super.visitClass(type);
             }
         }
-        return false;
-    }
-    // See if a function has an unknown type.
-    if ((0, types_1.isOverloadedFunction)(type)) {
-        return types_1.OverloadedFunctionType.getOverloads(type).some((overload) => {
-            return isPartlyUnknown(overload, /* allowUnknownTypeArgsForClasses */ false, recursionCount);
-        });
-    }
-    if ((0, types_1.isFunction)(type)) {
-        for (let i = 0; i < type.details.parameters.length; i++) {
-            // Ignore parameters such as "*" that have no name.
-            if (type.details.parameters[i].name) {
-                const paramType = types_1.FunctionType.getEffectiveParameterType(type, i);
-                if (isPartlyUnknown(paramType, /* allowUnknownTypeArgsForClasses */ false, recursionCount)) {
-                    return true;
-                }
+        visitFunction(type) {
+            if (this._recurse) {
+                super.visitFunction(type);
             }
         }
-        if (type.details.declaredReturnType &&
-            !types_1.FunctionType.isParamSpecValue(type) &&
-            isPartlyUnknown(type.details.declaredReturnType, /* allowUnknownTypeArgsForClasses */ false, recursionCount)) {
-            return true;
+    }
+    const walker = new AnyOrUnknownWalker(recurse);
+    walker.walk(type);
+    return walker.anyOrUnknownType;
+}
+exports.containsAnyOrUnknown = containsAnyOrUnknown;
+// Determines if any part of the type contains "Unknown", including any type arguments.
+function isPartlyUnknown(type, allowUnknownTypeArgsForClasses = false) {
+    class PartlyUnknownWalker extends typeWalker_1.TypeWalker {
+        constructor(_allowUnknownTypeArgsForClasses) {
+            super();
+            this._allowUnknownTypeArgsForClasses = _allowUnknownTypeArgsForClasses;
+            this.isPartlyUnknown = false;
+        }
+        visitUnknown(type) {
+            this.isPartlyUnknown = true;
+            // No need to keep walking.
+            this.cancelWalk();
+        }
+        visitClass(type) {
+            if (!this._allowUnknownTypeArgsForClasses || !types_1.TypeBase.isInstantiable(type)) {
+                super.visitClass(type);
+            }
         }
-        return false;
     }
-    return false;
+    const walker = new PartlyUnknownWalker(allowUnknownTypeArgsForClasses);
+    walker.walk(type);
+    return walker.isPartlyUnknown;
 }
 exports.isPartlyUnknown = isPartlyUnknown;
 // If the specified type is a generic class with a single type argument
@@ -1853,6 +1800,31 @@ function specializeTupleClass(classType, typeArgs, isTypeArgumentExplicit = true
     return clonedClassType;
 }
 exports.specializeTupleClass = specializeTupleClass;
+// If the array contains two or more class types that are all the same
+// generic type, return the common "erased" type — a type that
+// replaces all of the type arguments with Unknown.
+function getCommonErasedType(types) {
+    if (types.length < 2) {
+        return undefined;
+    }
+    if (!(0, types_1.isClass)(types[0])) {
+        return undefined;
+    }
+    for (let i = 1; i < types.length; i++) {
+        const candidate = types[i];
+        if (!(0, types_1.isClass)(candidate) ||
+            types_1.TypeBase.isInstance(candidate) !== types_1.TypeBase.isInstance(types[0]) ||
+            !types_1.ClassType.isSameGenericClass(types[0], candidate)) {
+            return undefined;
+        }
+    }
+    if (isTupleClass(types[0])) {
+        return specializeTupleClass(types[0], [{ type: types_1.UnknownType.create(), isUnbounded: true }]);
+    }
+    return types_1.ClassType.cloneForSpecialization(types[0], types[0].details.typeParameters.map((t) => types_1.UnknownType.create()), 
+    /* isTypeArgumentExplicit */ true);
+}
+exports.getCommonErasedType = getCommonErasedType;
 // If the type is a function or overloaded function that has a paramSpec
 // associated with it and P.args and P.kwargs at the end of the signature,
 // it removes these parameters from the function.
@@ -1956,13 +1928,30 @@ function requiresSpecialization(type, ignorePseudoGeneric = false, ignoreSelf =
         return false;
     }
     recursionCount++;
+    // Is the answer cached?
+    const canUseCache = !ignorePseudoGeneric && !ignoreSelf;
+    if (canUseCache && ((_a = type.cached) === null || _a === void 0 ? void 0 : _a.requiresSpecialization) !== undefined) {
+        return type.cached.requiresSpecialization;
+    }
+    const result = _requiresSpecialization(type, ignorePseudoGeneric, ignoreSelf, recursionCount);
+    if (canUseCache) {
+        if (type.cached === undefined) {
+            type.cached = {};
+        }
+        type.cached.requiresSpecialization = result;
+    }
+    return result;
+}
+exports.requiresSpecialization = requiresSpecialization;
+function _requiresSpecialization(type, ignorePseudoGeneric = false, ignoreSelf = false, recursionCount = 0) {
+    var _a;
     switch (type.category) {
         case 7 /* Class */: {
             if (types_1.ClassType.isPseudoGenericClass(type) && ignorePseudoGeneric) {
                 return false;
             }
             if (type.typeArguments) {
-                return (type.typeArguments.find((typeArg) => requiresSpecialization(typeArg, ignorePseudoGeneric, ignoreSelf, recursionCount)) !== undefined);
+                return type.typeArguments.some((typeArg) => requiresSpecialization(typeArg, ignorePseudoGeneric, ignoreSelf, recursionCount));
             }
             return types_1.ClassType.getTypeParameters(type).length > 0;
         }
@@ -1991,10 +1980,10 @@ function requiresSpecialization(type, ignorePseudoGeneric = false, ignoreSelf =
             return false;
         }
         case 6 /* OverloadedFunction */: {
-            return (type.overloads.find((overload) => requiresSpecialization(overload, ignorePseudoGeneric, ignoreSelf, recursionCount)) !== undefined);
+            return type.overloads.some((overload) => requiresSpecialization(overload, ignorePseudoGeneric, ignoreSelf, recursionCount));
         }
         case 9 /* Union */: {
-            return ((0, types_1.findSubtype)(type, (subtype) => requiresSpecialization(subtype, ignorePseudoGeneric, ignoreSelf, recursionCount)) !== undefined);
+            return type.subtypes.some((subtype) => requiresSpecialization(subtype, ignorePseudoGeneric, ignoreSelf, recursionCount));
         }
         case 10 /* TypeVar */: {
             // Most TypeVar types need to be specialized.
@@ -2013,7 +2002,6 @@ function requiresSpecialization(type, ignorePseudoGeneric = false, ignoreSelf =
     }
     return false;
 }
-exports.requiresSpecialization = requiresSpecialization;
 // Combines two variances to produce a resulting variance.
 function combineVariances(variance1, variance2) {
     if (variance1 === 1 /* Unknown */) {
@@ -2141,17 +2129,8 @@ function computeMroLinearization(classType) {
     // entries of the specified class. This is used once the class has been
     // added to the MRO.
     function filterClass(classToFilter, classLists) {
-        if ((classToFilter === null || classToFilter === void 0 ? void 0 : classToFilter.category) !== 7 /* Class */) {
-            // These "fail" calls are in place to diagnose a sporadic crash that
-            // we are seeing in the pylance telemetry. Delete these once we
-            // fix the underlying problem.
-            (0, debug_1.fail)(`Corrupted class type when computing MRO for ${classType.details.name}: ${JSON.stringify(classToFilter)}`);
-        }
         for (let i = 0; i < classLists.length; i++) {
             classLists[i] = classLists[i].filter((value) => {
-                if ((value === null || value === void 0 ? void 0 : value.category) === undefined) {
-                    (0, debug_1.fail)(`Unexpected undefined type when computing MRO for ${classType.details.name}: ${JSON.stringify(classLists)}`);
-                }
                 return !(0, types_1.isInstantiableClass)(value) || !types_1.ClassType.isSameGenericClass(value, classToFilter);
             });
         }
@@ -2480,14 +2459,14 @@ class TypeVarTransformer {
             : type;
     }
     transformTypeVarsInClassType(classType, recursionCount) {
+        const typeParams = types_1.ClassType.getTypeParameters(classType);
         // Handle the common case where the class has no type parameters.
-        if (types_1.ClassType.getTypeParameters(classType).length === 0 && !types_1.ClassType.isSpecialBuiltIn(classType)) {
+        if (typeParams.length === 0 && !types_1.ClassType.isSpecialBuiltIn(classType)) {
             return classType;
         }
         let newTypeArgs;
         let newTupleTypeArgs;
         let specializationNeeded = false;
-        const typeParams = types_1.ClassType.getTypeParameters(classType);
         const transformParamSpec = (paramSpec) => {
             const paramSpecValue = this.transformParamSpec(paramSpec, recursionCount);
             if (paramSpecValue) {
@@ -2795,10 +2774,14 @@ class UniqueFunctionSignatureTransformer extends TypeVarTransformer {
             // Create new type variables with the same scope but with
             // different (unique) names.
             sourceType.details.typeParameters.forEach((typeParam) => {
-                const replacement = types_1.TypeVarType.cloneForNewName(typeParam, `${typeParam.details.name}(${existingSignature.count})`);
+                let replacement = types_1.TypeVarType.cloneForNewName(typeParam, `${typeParam.details.name}(${existingSignature.count})`);
+                if (replacement.details.isParamSpec) {
+                    replacement = convertTypeToParamSpecValue(replacement);
+                }
                 typeVarContext.setTypeVarType(typeParam, replacement);
-                updatedSourceType = applySolvedTypeVars(sourceType, typeVarContext);
             });
+            updatedSourceType = applySolvedTypeVars(sourceType, typeVarContext);
+            (0, debug_1.assert)((0, types_1.isFunction)(updatedSourceType) || (0, types_1.isOverloadedFunction)(updatedSourceType));
         }
         this._signatureTracker.addSignature(sourceType);
         return updatedSourceType;
@@ -3014,19 +2997,20 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
     }
 }
 class ExpectedTypeTransformer extends TypeVarTransformer {
-    constructor(_liveTypeVarScopes) {
+    constructor(_liveTypeVarScopes, _usageOffset) {
         super();
         this._liveTypeVarScopes = _liveTypeVarScopes;
+        this._usageOffset = _usageOffset;
     }
     transformTypeVar(typeVar) {
         if (!this._isTypeVarLive(typeVar)) {
-            return types_1.TypeVarType.cloneAsInScopePlaceholder(typeVar);
+            return types_1.TypeVarType.cloneAsInScopePlaceholder(typeVar, this._usageOffset);
         }
         return typeVar;
     }
     transformParamSpec(paramSpec) {
         if (!this._isTypeVarLive(paramSpec)) {
-            return convertTypeToParamSpecValue(types_1.TypeVarType.cloneAsInScopePlaceholder(paramSpec));
+            return convertTypeToParamSpecValue(types_1.TypeVarType.cloneAsInScopePlaceholder(paramSpec, this._usageOffset));
         }
         return undefined;
     }
@@ -3042,7 +3026,7 @@ class InScopePlaceholderTransformer extends TypeVarTransformer {
     transformTypeVar(typeVar) {
         var _a;
         if (typeVar.isInScopePlaceholder) {
-            return (_a = this._signatureContext.getTypeVarType(typeVar)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
+            return (_a = this._signatureContext.getTypeVarType(typeVar)) !== null && _a !== void 0 ? _a : typeVar;
         }
         return typeVar;
     }