use correct names for files imported via star import (PY-5813)

This commit is contained in:
Dmitry Jemerov
2012-04-03 19:40:23 +02:00
parent 8f39d27194
commit e20ffc728a
6 changed files with 12 additions and 1 deletions
@@ -77,7 +77,7 @@ public abstract class VariantsProcessor implements PsiScopeProcessor {
final NameDefiner definer = (NameDefiner)element;
for (PyElement expr : definer.iterateNames()) {
if (expr != null && expr != myContext) { // NOTE: maybe rather have SingleIterables skip nulls outright?
String referencedName = expr.getName();
String referencedName = expr instanceof PyFile ? FileUtil.getNameWithoutExtension(((PyFile) expr).getName()) : expr.getName();
if (referencedName != null && nameIsAcceptable(referencedName)) {
addImportedElement(referencedName, definer, expr);
}
@@ -0,0 +1,3 @@
from shazam import *
xyzzy
@@ -0,0 +1,3 @@
from shazam import *
xy<caret>
@@ -0,0 +1 @@
import xyzzy
@@ -387,6 +387,10 @@ public class PythonCompletionTest extends PyTestCase {
doMultiFileTest();
}
public void testModuleDotPy() { // PY-5813
doMultiFileTest();
}
public void testHasAttr() { // PY-4423
doTest();
}