From 48d5f8ce589b9a2f9d386def5e2f1f45b73a30d8 Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Thu, 17 Apr 2014 18:27:11 +0400 Subject: [PATCH] Refactoring: getImportSourceQName() is used --- .../python/psi/impl/PyFromImportStatementImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java index 63705b41850e..c04d1c88b3f7 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java @@ -235,11 +235,10 @@ public class PyFromImportStatementImpl extends PyBaseElementImpl getFullyQualifiedObjectNames() { - final PyReferenceExpression source = getImportSource(); - String prefix = ""; - if (source != null) { - prefix = source.getText() + "."; - } + final QualifiedName source = getImportSourceQName(); + + final String prefix = (source != null) ? (source.join(".") + '.') : ""; + final List unqualifiedNames = PyImportStatementImpl.getImportElementNames(getImportElements()); final List result = new ArrayList(unqualifiedNames.size());