microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-11-03 21:30:08 +03:00
Code Issues Projects Releases Wiki Activity

Fixed bug where implementation of an overloaded function was included in the list of overloads leading to incorrect signature suggestions and false positives for various overload diagnostic checks.

Browse Source
This commit is contained in:
Eric Traut 2020-10-08 23:41:15 -07:00
parent 9897d65ab2
commit 18bee09129
3 changed files with 29 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10665,7 +10665,7 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
}
// Given a function node and the function type associated with it, this
// method search for prior function nodes that are marked as @overload
// method searches for prior function nodes that are marked as @overload
// and creates an OverloadedFunctionType that includes this function and
// all previous ones.
function addOverloadsToFunctionType(node: FunctionNode, type: FunctionType): Type {
@ -10679,48 +10679,39 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
const decls = symbolWithScope.symbol.getDeclarations();
// Find this function's declaration.
let declIndex = decls.findIndex((decl) => decl === functionDecl);
const declIndex = decls.findIndex((decl) => decl === functionDecl);
if (declIndex > 0) {
const overloadedTypes: FunctionType[] = [type];
while (declIndex > 0) {
const decl = decls[declIndex - 1];
if (decl.type !== DeclarationType.Function) {
break;
}
const overloadedTypes: FunctionType[] = [];
const declTypeInfo = getTypeOfFunction(decl.node);
if (!declTypeInfo) {
break;
}
if (declTypeInfo.decoratedType.category === TypeCategory.Function) {
if (FunctionType.isOverloaded(declTypeInfo.decoratedType)) {
overloadedTypes.unshift(declTypeInfo.decoratedType);
} else {
break;
// Look at the previous declaration's type.
const prevDecl = decls[declIndex - 1];
if (prevDecl.type === DeclarationType.Function) {
const prevDeclDeclTypeInfo = getTypeOfFunction(prevDecl.node);
if (prevDeclDeclTypeInfo) {
if (prevDeclDeclTypeInfo.decoratedType.category === TypeCategory.Function) {
if (FunctionType.isOverloaded(prevDeclDeclTypeInfo.decoratedType)) {
overloadedTypes.push(prevDeclDeclTypeInfo.decoratedType);
}
} else if (prevDeclDeclTypeInfo.decoratedType.category === TypeCategory.OverloadedFunction) {
// If the previous declaration was itself an overloaded function,
// copy the entries from it.
overloadedTypes.push(...prevDeclDeclTypeInfo.decoratedType.overloads);
}
} else if (declTypeInfo.decoratedType.category === TypeCategory.OverloadedFunction) {
// If the previous declaration was itself an overloaded function,
// copy the last entry out of it.
const lastOverload =
declTypeInfo.decoratedType.overloads[declTypeInfo.decoratedType.overloads.length - 1];
if (FunctionType.isOverloaded(lastOverload)) {
overloadedTypes.unshift(lastOverload);
} else {
break;
}
} else {
break;
}
}
declIndex--;
if (FunctionType.isOverloaded(type)) {
overloadedTypes.push(type);
}
if (overloadedTypes.length === 1) {
return overloadedTypes[0];
}
if (overloadedTypes.length > 1) {
// Create a new overloaded type that copies the contents of the previous
// one and adds a new function.
const newOverload = OverloadedFunctionType.create();
newOverload.overloads = overloadedTypes;
const newOverload = OverloadedFunctionType.create(overloadedTypes);
const prevOverload = overloadedTypes[overloadedTypes.length - 2];
const isPrevOverloadAbstract = FunctionType.isAbstractMethod(prevOverload);

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

@ -7,7 +7,6 @@
* Collection of functions that operate on Type objects.
*/
import { DiagnosticAddendum } from '../common/diagnostic';
import { ParameterCategory } from '../parser/parseNodes';
import { DeclarationType } from './declaration';
import { Symbol, SymbolFlags, SymbolTable } from './symbol';

14
packages/pyright-internal/src/tests/fourslash/signature.overload.fourslash.ts
View File

@ -36,32 +36,28 @@
label: '(x: int, y: int) -> str',
parameters: ['x: int', 'y: int'],
},
{
label: '(*args: Unknown) -> None',
parameters: ['*args: Unknown'],
},
];
helper.verifySignature({
o1: {
signatures: overloadedSignatures,
activeParameters: [undefined, 0, 0, 0],
activeParameters: [undefined, 0, 0],
},
o2: {
signatures: overloadedSignatures,
activeParameters: [undefined, undefined, 1, 0],
activeParameters: [undefined, undefined, 1],
},
o3: {
signatures: overloadedSignatures,
activeParameters: [undefined, undefined, undefined, 0],
activeParameters: [undefined, undefined, undefined],
},
o4: {
signatures: overloadedSignatures,
activeParameters: [undefined, undefined, undefined, 0],
activeParameters: [undefined, undefined, undefined],
},
o5: {
signatures: overloadedSignatures,
activeParameters: [undefined, 0, 0, 0],
activeParameters: [undefined, 0, 0],
callHasParameters: false,
},
});