microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-10-06 12:57:14 +03:00
Code Issues Projects Releases Wiki Activity

Code cleanup for selfSpecializeClass.

Browse Source
This commit is contained in:
Eric Traut 2024-07-07 12:29:52 -07:00
parent 5332daa9cb
commit ab6fe409a6
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/pyright-internal/src/analyzer/typeEvaluator.ts
View File

@ -22355,7 +22355,7 @@ export function createTypeEvaluator(
const specializedType = partiallySpecializeType(
typeResult.type,
member.unspecializedClassType,
selfSpecializeClass(selfClass, /* overrideTypeArgs */ true)
selfSpecializeClass(selfClass, { overrideTypeArgs: true })
);
if (

13
packages/pyright-internal/src/analyzer/typeUtils.ts
View File

@ -281,6 +281,12 @@ export interface IsInstantiableOptions {
honorTypeVarBounds?: boolean;
}
export interface SelfSpecializeOptions {
// Override any existing type arguments? By default,
// existing type arguments are left as is.
overrideTypeArgs?: boolean;
}
// Tracks whether a function signature has been seen before within
// an expression. For example, in the expression "foo(foo, foo)", the
// signature for "foo" will be seen three times at three different
@ -1156,16 +1162,17 @@ export function getUnknownTypeForCallable(): FunctionType {
// If the class is generic and not already specialized, this function
// "self specializes" the class, filling in its own type parameters
// as type arguments.
export function selfSpecializeClass(type: ClassType, overrideTypeArgs = false): ClassType {
export function selfSpecializeClass(type: ClassType, options?: SelfSpecializeOptions): ClassType {
if (type.details.typeParameters.length === 0) {
return type;
}
if (type.typeArguments && !overrideTypeArgs) {
if (type.typeArguments && !options?.overrideTypeArgs) {
return type;
}
return ClassType.cloneForSpecialization(type, type.details.typeParameters, /* isTypeArgumentExplicit */ true);
const typeParams = type.details.typeParameters;
return ClassType.cloneForSpecialization(type, typeParams, /* isTypeArgumentExplicit */ true);
}
// Determines whether the type derives from tuple. If so, it returns