Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions packages/pyright-internal/src/analyzer/typeUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -336,25 +336,20 @@ export function isTypeVarSame(type1: TypeVarType, type2: Type) {
return false;
}

let isCompatible = true;
doForEachSubtype(type2, (subtype) => {
if (!isCompatible) {
return;
}

return allSubtypes(type2, (subtype) => {
if (!isTypeSame(type1, subtype)) {
const conditions = getTypeCondition(subtype);

if (
!conditions ||
!conditions.some((condition) => condition.typeVar.priv.nameWithScope === type1.priv.nameWithScope)
) {
isCompatible = false;
return false;
}
}
});

return isCompatible;
return true;
});
}

export function makeInferenceContext(
Expand Down Expand Up @@ -796,12 +791,10 @@ export function someSubtypes(type: Type, callback: (type: Type) => boolean): boo

export function allSubtypes(type: Type, callback: (type: Type) => boolean): boolean {
if (isUnion(type)) {
return type.priv.subtypes.every((subtype) => {
callback(subtype);
});
} else {
return callback(type);
return type.priv.subtypes.every((subtype) => callback(subtype));
}

return callback(type);
}

export function doForEachSignature(
Expand Down
96 changes: 96 additions & 0 deletions packages/pyright-internal/src/tests/typeUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ import * as assert from 'assert';

import { ConstraintSolution } from '../analyzer/constraintSolution';
import {
allSubtypes,
applySolvedTypeVars,
containsLiteralType,
mapSignatures,
someSubtypes,
transformExpectedType,
transformTypePair,
} from '../analyzer/typeUtils';
Expand All @@ -35,6 +37,7 @@ import {
TypeCategory,
TypeVarScopeType,
TypeVarType,
UnionableType,
UnionType,
UnknownType,
Variance,
Expand Down Expand Up @@ -362,6 +365,76 @@ test('Transform aligned class arguments but preserve mismatched wrappers', () =>
);
});

test('AllSubtypes', () => {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue · Please address or respond

Move both new tests above the existing file-scoped helper section. Appending tests after createFunction, createClass, and replacePair violates docs/pylancewiki/review/tests-helper-placement.md, which requires helpers at the end of their scope.

const unionType = createUnion(createClassType('A'), createClassType('B'), createClassType('C'));
const visitedSubtypes: Type[] = [];

const result = allSubtypes(unionType, (subtype) => {
visitedSubtypes.push(subtype);
return visitedSubtypes.length < 2;
});

assert.strictEqual(result, false);
assert.strictEqual(visitedSubtypes.length, 2);

assert.strictEqual(
allSubtypes(unionType, () => {
return true;
}),
true
);

const singleType = createClassType('D');
assert.strictEqual(
allSubtypes(singleType, (subtype) => {
assert.strictEqual(subtype, singleType);
return true;
}),
true
);
});

test('AllSubtypes passes only the subtype to callbacks', () => {
const literal = ClassType.cloneWithLiteral(ClassType.cloneAsInstance(createClass('Value')), 1);
const nested = ClassType.specialize(ClassType.cloneAsInstance(createClass('Container')), [literal]);

assert.strictEqual(containsLiteralType(literal), true);
assert.strictEqual(containsLiteralType(nested), false);
assert.strictEqual(containsLiteralType(nested, true), true);
assert.strictEqual(allSubtypes(createUnion(literal, nested), containsLiteralType), false);
assert.strictEqual(allSubtypes(createUnion(nested, literal), containsLiteralType), false);
assert.strictEqual(allSubtypes(nested, containsLiteralType), false);
});

test('SomeSubtypes', () => {
const unionType = createUnion(createClassType('A'), createClassType('B'), createClassType('C'));
const visitedSubtypes: Type[] = [];

const result = someSubtypes(unionType, (subtype) => {
visitedSubtypes.push(subtype);
return visitedSubtypes.length === 2;
});

assert.strictEqual(result, true);
assert.strictEqual(visitedSubtypes.length, 2);

assert.strictEqual(
someSubtypes(unionType, () => {
return false;
}),
false
);

const singleType = createClassType('D');
assert.strictEqual(
someSubtypes(singleType, (subtype) => {
assert.strictEqual(subtype, singleType);
return false;
}),
false
);
});

function createFunction(parameterType: Type, defaultType: Type, returnType: Type) {
const functionType = FunctionType.createInstance('', '', '', FunctionTypeFlags.None);
FunctionType.addParam(
Expand Down Expand Up @@ -389,3 +462,26 @@ function replacePair(source: Type, target: Type) {
return (sourceNode: Type, targetNode: Type) =>
sourceNode === source && targetNode === target ? targetNode : undefined;
}

function createClassType(name: string, flags = ClassTypeFlags.None) {
const classType = ClassType.createInstantiable(
name,
name,
'',
Uri.empty(),
flags,
0,
/* declaredMetaclass*/ undefined,
/* effectiveMetaclass */ undefined
);
classType.shared.mro.push(classType);
return classType;
}

function createUnion(...subtypes: readonly UnionableType[]) {
const unionType = UnionType.create();
subtypes.forEach((subtype) => {
UnionType.addType(unionType, subtype);
});
return unionType;
}
Loading