From 088bcbf6e61be7ca1ad58064fdefe4a2d7c660fa Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Mon, 18 Aug 2014 21:51:11 +0400 Subject: [PATCH] Fixed QualifiedNameFinder.getQualifiedName() for built-in names --- .../python/psi/resolve/QualifiedNameFinder.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/python/src/com/jetbrains/python/psi/resolve/QualifiedNameFinder.java b/python/src/com/jetbrains/python/psi/resolve/QualifiedNameFinder.java index 5dff29010e63..1c081eff9356 100644 --- a/python/src/com/jetbrains/python/psi/resolve/QualifiedNameFinder.java +++ b/python/src/com/jetbrains/python/psi/resolve/QualifiedNameFinder.java @@ -172,12 +172,17 @@ public class QualifiedNameFinder { return classQName + "." + name; } } - else if (owner instanceof PyFile && !builtinCache.isBuiltin(element)) { - final VirtualFile virtualFile = ((PyFile)owner).getVirtualFile(); - if (virtualFile != null) { - final String fileQName = findShortestImportableName(element, virtualFile); - if (fileQName != null) { - return fileQName + "." + name; + else if (owner instanceof PyFile) { + if (builtinCache.isBuiltin(element)) { + return name; + } + else { + final VirtualFile virtualFile = ((PyFile)owner).getVirtualFile(); + if (virtualFile != null) { + final String fileQName = findShortestImportableName(element, virtualFile); + if (fileQName != null) { + return fileQName + "." + name; + } } } }