MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Pass 'inherited' resolve flag to PyType ancestors

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2013-04-23 18:29:43 +04:00
parent c56a56cd96
commit 1df8d5baa5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/types/PyImportedModuleType.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class PyImportedModuleType implements PyType {
final PsiElement resolved = myImportedModule.resolve();
if (resolved instanceof PyFile) {
final PyFile file = (PyFile)resolved;
return new PyModuleType(file, myImportedModule).resolveMember(name, location, direction, resolveContext, true);
return new PyModuleType(file, myImportedModule).resolveMember(name, location, direction, resolveContext, inherited);
}
else if (resolved instanceof PsiDirectory) {
final List<PsiElement> elements = Collections.singletonList(ResolveImportUtil.resolveChild(resolved, name, null, true, true));
python/src/com/jetbrains/python/psi/types/PyUnionType.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class PyUnionType implements PyType {
boolean all_nulls = true;
for (PyType member : myMembers) {
if (member != null) {
List<? extends RatedResolveResult> result = member.resolveMember(name, null, direction, resolveContext, true);
List<? extends RatedResolveResult> result = member.resolveMember(name, null, direction, resolveContext, inherited);
if (result != null) {
all_nulls = false;
ret.addAll(result);