diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java index f79490821d0a..1ffd3798d11e 100644 --- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java +++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java @@ -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 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 resolveInCurrentFrame(final String name, XSourcePosition currentPosition, PsiFile file) { final Ref 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; }