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

Fixed resolve for nested comprehensions (PY-6316)

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2012-04-23 15:50:34 +04:00
parent ab0ce2890c
commit 04a8991cbe
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/references/PyReferenceImpl.java
+6 -3
View File
@@ -147,9 +147,12 @@ public class PyReferenceImpl implements PsiReferenceEx, PsiPolyVariantReference
PsiElement definition = instruction.getElement();
NameDefiner definer = null;
// TODO: This check may slow down resolving, but it is the current solution to the comprehension scopes problem
final PyComprehensionElement defComprh = PsiTreeUtil.getParentOfType(definition, PyComprehensionElement.class);
if (defComprh != null && defComprh != PsiTreeUtil.getParentOfType(element, PyComprehensionElement.class)) {
continue;
final PyComprehensionElement definitionComprehension = PsiTreeUtil.getParentOfType(definition, PyComprehensionElement.class);
if (definitionComprehension != null) {
final PyComprehensionElement elementComprehension = PsiTreeUtil.getParentOfType(element, PyComprehensionElement.class);
if (elementComprehension == null || !PsiTreeUtil.isAncestor(definitionComprehension, elementComprehension, false)) {
continue;
}
}
if (definition instanceof NameDefiner && !(definition instanceof PsiNamedElement)) {
definer = (NameDefiner)definition;
python/testData/inspections/PyUnresolvedReferencesInspection/nestedComprehensions.py
+2
View File
@@ -0,0 +1,2 @@
def f(xs, ys):
return [[(x, y) for y in ys] for x in xs]
python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
+5
View File
@@ -97,6 +97,11 @@ public class PyUnresolvedReferencesInspectionTest extends PyTestCase {
doTest();
}
// PY-6316
public void testNestedComprehensions() {
doTest();
}
private void doMultiFileTest() {
myFixture.copyFileToProject("inspections/PyUnresolvedReferencesInspection/__init__.py", "PyUnresolvedReferencesInspection/__init__.py");
myFixture.copyFileToProject("inspections/PyUnresolvedReferencesInspection/" + getTestName(true) + ".py",