diff --git a/python/src/com/jetbrains/python/documentation/DocStringTypeReference.java b/python/src/com/jetbrains/python/documentation/DocStringTypeReference.java index 9b8dace47630..8a22ec626c41 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringTypeReference.java +++ b/python/src/com/jetbrains/python/documentation/DocStringTypeReference.java @@ -1,6 +1,7 @@ package com.jetbrains.python.documentation; import com.google.common.collect.Lists; +import com.intellij.codeInsight.completion.CompletionUtil; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; @@ -113,7 +114,7 @@ public class DocStringTypeReference extends PsiPolyVariantReferenceBase namesAlready = new HashSet(); ctx.put(PyType.CTX_NAMES, namesAlready); diff --git a/python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java b/python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java index 0d6e61c479d5..555acaeb49f9 100644 --- a/python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java +++ b/python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java @@ -348,7 +348,9 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType { boolean suppressParentheses = context.get(CTX_SUPPRESS_PARENTHESES) != null; addOwnClassMembers(location, namesAlready, suppressParentheses, ret); - final TypeEvalContext typeEvalContext = TypeEvalContext.userInitiated(location != null ? location.getContainingFile() : null); + final TypeEvalContext typeEvalContext = TypeEvalContext.userInitiated(location != null ? + CompletionUtil.getOriginalOrSelf(location).getContainingFile() : + null); addInheritedMembers(prefix, location, namesAlready, context, ret, typeEvalContext); // from providers