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-80195 Literals of Enums broken after import (2025.1 EAP)

Browse Source 
Consider enum attribute of an unknown type an enum member.

(cherry picked from commit 72c2fd37f18e4dde65d735f1032495df5aeda791)

GitOrigin-RevId: 7e56afe6a2d2efe0ea84ac20672aaf7712d8ed23
This commit is contained in:
Petr
2025-04-10 14:25:09 +02:00
committed by intellij-monorepo-bot
parent ed52e34951
commit c52f4bbadf
7 changed files with 131 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
python/python-psi-impl/src/com/jetbrains/python/codeInsight/stdlib/PyStdlibTypeProvider.java
View File

@@ -57,6 +57,11 @@ public final class PyStdlibTypeProvider extends PyTypeProviderBase {
return null;
}
@Override
public @Nullable PyType getCallableType(@NotNull PyCallable callable, @NotNull TypeEvalContext context) {
return Ref.deref(getTransformedEnumAttributeType(callable, context));
}
@Override
public @Nullable PyType getReferenceExpressionType(@NotNull PyReferenceExpression referenceExpression, @NotNull TypeEvalContext context) {
if (!referenceExpression.isQualified()) {
@@ -86,12 +91,12 @@ public final class PyStdlibTypeProvider extends PyTypeProviderBase {
*/
@ApiStatus.Internal
public static @Nullable PyLiteralType getEnumMemberType(@NotNull PsiElement element, @NotNull TypeEvalContext context) {
return ObjectUtils.tryCast(Ref.deref(getEnumAttributeType(element, context)), PyLiteralType.class);
return ObjectUtils.tryCast(Ref.deref(getTransformedEnumAttributeType(element, context)), PyLiteralType.class);
}
private static @Nullable Ref<PyType> getEnumType(@NotNull PsiElement referenceTarget, @NotNull TypeEvalContext context,
@Nullable PsiElement anchor) {
@Nullable Ref<PyType> enumAttributeType = getEnumAttributeType(referenceTarget, context);
@Nullable Ref<PyType> enumAttributeType = getTransformedEnumAttributeType(referenceTarget, context);
if (enumAttributeType != null) {
return enumAttributeType;
}
@@ -135,11 +140,12 @@ public final class PyStdlibTypeProvider extends PyTypeProviderBase {
return null;
}
private static @Nullable Ref<PyType> getEnumAttributeType(@NotNull PsiElement element, @NotNull TypeEvalContext context) {
return RecursionManager.doPreventingRecursion(element, false, () -> getEnumAttributeTypeImpl(element, context));
// Returns the type of enum attribute value transformed by 'EnumType' metaclass or null, if the attribute value is not transformed
private static @Nullable Ref<PyType> getTransformedEnumAttributeType(@NotNull PsiElement element, @NotNull TypeEvalContext context) {
return RecursionManager.doPreventingRecursion(element, false, () -> getTransformedEnumAttributeTypeImpl(element, context));
}
private static @Nullable Ref<PyType> getEnumAttributeTypeImpl(@NotNull PsiElement element, @NotNull TypeEvalContext context) {
private static @Nullable Ref<PyType> getTransformedEnumAttributeTypeImpl(@NotNull PsiElement element, @NotNull TypeEvalContext context) {
if (!(element instanceof PyTargetExpression) && !(element instanceof PyDecoratable)) return null;
if (!(ScopeUtil.getScopeOwner(element) instanceof PyClass cls && isCustomEnum(cls, context))) return null;
@@ -216,6 +222,7 @@ public final class PyStdlibTypeProvider extends PyTypeProviderBase {
else {
if (!targetExpression.hasAssignedValue()) return null;
// Handle enum.auto(), enum.member(), enum.nonmember()
PyTargetExpressionStub stub = targetExpression.getStub();
PyEnumAttributeStub attributeStub = stub != null
? stub.getCustomStub(PyEnumAttributeStub.class)
@@ -228,29 +235,22 @@ public final class PyStdlibTypeProvider extends PyTypeProviderBase {
QualifiedName assignedQName = targetExpression.getAssignedQName();
if (assignedQName != null) {
PsiElement value = ContainerUtil.getFirstItem(PyResolveUtil.resolveQualifiedNameInScope(assignedQName, enumClass, context));
if (value != null) {
Ref<PyType> type = getEnumAttributeType(value, context);
return type == null ? null : getEnumAttributeInfo(enumClass, type.get(), context);
}
PsiElement resolved = ContainerUtil.getFirstItem(PyResolveUtil.resolveQualifiedNameInScope(assignedQName, enumClass, context));
PyType type = resolved instanceof PyTypedElement ? context.getType((PyTypedElement)resolved) : null;
return getEnumAttributeInfo(enumClass, type, context);
}
PyLiteralKind literalKind = stub != null
? stub.getAssignedLiteralKind()
: PyLiteralKind.fromExpression(targetExpression.findAssignedValue());
if (literalKind == null) {
return EnumAttributeInfo.nonMember(null);
}
else {
PyType type = PyUtil.convertToType(literalKind, PyBuiltinCache.getInstance(targetExpression));
return new EnumAttributeInfo(type, EnumAttributeKind.MEMBER);
}
PyType type = literalKind != null ? PyUtil.convertToType(literalKind, PyBuiltinCache.getInstance(targetExpression)) : null;
return new EnumAttributeInfo(type, EnumAttributeKind.MEMBER);
}
}
private static @NotNull EnumAttributeInfo getEnumAttributeInfo(@NotNull PyClass enumClass, @Nullable PyType type, @NotNull TypeEvalContext context) {
if (type == null) {
return EnumAttributeInfo.nonMember(null);
return new EnumAttributeInfo(null, EnumAttributeKind.MEMBER);
}
PyQualifiedNameOwner typeDeclarationElement = type.getDeclarationElement();
if (typeDeclarationElement != null) {