MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 23:31:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-70484 Replace unbound ParamSpecs in result types with (*args: Any, **kwargs: Any)

Browse Source 
GitOrigin-RevId: 5e6950217409b690993d75bc0fdfdada5420f08f
This commit is contained in:
Mikhail Golubev
2024-02-19 11:40:37 +02:00
committed by intellij-monorepo-bot
parent 7320815ad2
commit f7adf25ecb
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeChecker.java
View File

@@ -932,8 +932,8 @@ public final class PyTypeChecker {
@NotNull TypeEvalContext context) {
GenericSubstitutions existingSubstitutions = substitutions == null ? new GenericSubstitutions() : substitutions;
Generics typeParamsFromReturnType = collectGenerics(returnType, context);
// TODO Handle unmatched ParamSpecs and TypeVarTuples here as well
if (typeParamsFromReturnType.typeVars.isEmpty()) {
// TODO Handle unmatched TypeVarTuples here as well
if (typeParamsFromReturnType.typeVars.isEmpty() && typeParamsFromReturnType.paramSpecs.isEmpty()) {
return existingSubstitutions;
}
Set<PyType> visited = new HashSet<>();
@@ -951,6 +951,20 @@ public final class PyTypeChecker {
existingSubstitutions.typeVars.put(returnTypeParam, null);
}
}
for (PyParamSpecType paramSpecType : typeParamsFromReturnType.paramSpecs) {
// ParamSpecs already bound to parameter lists
if (paramSpecType.getParameters() != null) {
continue;
}
boolean canGetBoundFromArguments = typeParamsFromParameterTypes.paramSpecs.contains(paramSpecType);
boolean isAlreadyBound = existingSubstitutions.paramSpecs.containsKey(paramSpecType);
if (canGetBoundFromArguments && !isAlreadyBound) {
existingSubstitutions.paramSpecs.put(paramSpecType, new PyParamSpecType(paramSpecType.getName())
.withParameters(List.of(PyCallableParameterImpl.positionalNonPsi("args", null),
PyCallableParameterImpl.keywordNonPsi("kwargs", null)),
context));
}
}
return existingSubstitutions;
}
@@ -1073,6 +1087,8 @@ public final class PyTypeChecker {
if (!typeVarTupleType.equals(substitution) && hasGenerics(substitution, context)) {
return substitute(substitution, substitutions, context, substituting);
}
// TODO This should happen in getSubstitutionsWithUnresolvedReturnGenerics, but it won't work for inherited constructors
// as in testVariadicGenericCheckTypeAliasesRedundantParameter, investigate why
// Replace unknown TypeVarTuples by *tuple[Any, ...] instead of plain Any
return substitution == null ? PyUnpackedTupleTypeImpl.UNSPECIFIED : substitution;
}