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

Minors after merging pull request #383

Browse Source
This commit is contained in:
Elizaveta Shashkova
2016-04-19 17:33:39 +03:00
parent d12e8b4266
commit 76db6e7512
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+6 -12
View File
@@ -857,23 +857,21 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
}
else {
final PyType parentDef = resolveTypeFromString(parentType, file);
if (parentDef == null)
if (parentDef == null) {
return null;
}
List<? extends RatedResolveResult> results =
parentDef.resolveMember(name, null, AccessDirection.READ, PyResolveContext.noImplicits());
if (results != null && !results.isEmpty()) {
return XSourcePositionImpl.createByElement(results.get(0).getElement());
}
else {
return typeToPosition(parentDef); // at least try to return parent
return typeToPosition(parentDef); // at least try to return parent
}
}
}
@NotNull
private static Ref<PsiElement> resolveInCurrentFrame(final String name, XSourcePosition currentPosition, PsiFile file) {
final Ref<PsiElement> elementRef = Ref.create();
@@ -894,7 +892,6 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
elementRef.set(element);
}
return false;
}
return true;
}
@@ -941,8 +938,7 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
final PyType pyType = resolveTypeFromString(typeName, file);
return pyType == null? null : typeToPosition(pyType);
return pyType == null ? null : typeToPosition(pyType);
}
@Nullable
@@ -967,16 +963,14 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
pyType = PyTypeParser.getTypeByName(file, typeName);
}
if (pyType == null)
{
if (pyType == null) {
PyElementGenerator generator = PyElementGenerator.getInstance(getProject());
PyPsiFacade psiFacade = PyPsiFacade.getInstance(getProject());
PsiFile dummyFile = generator.createDummyFile( ((PyFile)file).getLanguageLevel() , "");
PsiFile dummyFile = generator.createDummyFile(((PyFile)file).getLanguageLevel(), "");
Module moduleForFile = ModuleUtilCore.findModuleForPsiElement(file);
dummyFile.putUserData(ModuleUtilCore.KEY_MODULE, moduleForFile);
pyType = psiFacade.parseTypeAnnotation(typeName, dummyFile);
}
return pyType;
}