microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-09-11 16:06:39 +03:00
Code Issues Projects Releases Wiki Activity

Fixed bug in assignment type matching logic when used with Tuple with a variadic type argument list (...).

Browse Source
This commit is contained in:
Eric Traut 2019-04-19 19:47:47 -07:00
parent 43630d4cb8
commit 7b4c47f7fc
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/analyzer/typeAnalyzer.ts
View File

@ -937,8 +937,10 @@ export class TypeAnalyzer extends ParseTreeWalker {
let aliasClass = ScopeUtils.getBuiltInType(this._currentScope,
assignedName.toLowerCase());
if (aliasClass instanceof ClassType) {
specialClassType.addBaseClass(aliasClass, false);
specialClassType.setAliasClass(aliasClass);
let specializedBaseClass = TypeUtils.specializeType(aliasClass, undefined);
specialClassType.addBaseClass(specializedBaseClass, false);
}
specialType = specialClassType;
@ -2191,16 +2193,26 @@ export class TypeAnalyzer extends ParseTreeWalker {
const tupleType = TypeUtils.getSpecializedTupleType(type);
if (tupleType && tupleType.getTypeArguments()) {
const entryTypes = tupleType.getTypeArguments()!;
if (entryTypes.length !== target.expressions.length) {
this._addError(
`Tuple size mismatch: expected ${ target.expressions.length }` +
` but got ${ entryTypes.length }`,
target);
} else {
let entryCount = entryTypes.length;
const allowsMoreEntries = entryCount > 0 &&
entryTypes[entryCount - 1] instanceof AnyType &&
(entryTypes[entryCount - 1] as AnyType).isEllipsis();
if (allowsMoreEntries) {
entryCount--;
}
if (target.expressions.length === entryCount ||
(allowsMoreEntries && target.expressions.length >= entryCount)) {
target.expressions.forEach((expr, index) => {
this._assignTypeToExpression(expr, entryTypes[index], srcExpr);
const entryType = index < entryCount ? entryTypes[index] : UnknownType.create();
this._assignTypeToExpression(expr, entryType, srcExpr);
});
assignedTypes = true;
} else {
this._addError(
`Tuple size mismatch: expected ${ target.expressions.length }` +
` but got ${ entryCount }`,
target);
}
}