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

no stubs for variables in list comprehensions (PY-4029)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-06-28 21:26:20 +02:00
parent 8c042c0a22
commit d6b38bf165
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java
+6 -2
View File
@@ -8,6 +8,7 @@ import com.intellij.psi.stubs.IndexSink;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.stubs.StubInputStream;
import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.io.StringRef;
import com.jetbrains.python.PyElementTypes;
import com.jetbrains.python.psi.*;
@@ -102,18 +103,21 @@ public class PyTargetExpressionElementType extends PyStubElementType<PyTargetExp
}
public boolean shouldCreateStub(final ASTNode node) {
if (PsiTreeUtil.getParentOfType(node.getPsi(), PyComprehensionElement.class, true, PyDocStringOwner.class) != null) {
return false;
}
final ASTNode functionNode = TreeUtil.findParent(node, PyElementTypes.FUNCTION_DECLARATION);
final ASTNode qualifierNode = node.findChildByType(PyElementTypes.REFERENCE_EXPRESSION);
if (functionNode != null && qualifierNode != null) {
final ASTNode parameterList = functionNode.findChildByType(PyElementTypes.PARAMETER_LIST);
assert parameterList != null;
final ASTNode[] children = parameterList.getChildren(PyElementTypes.FORMAL_PARAMETER_SET);
if (children.length > 0 && children [0].getText().equals(qualifierNode.getText())) {
if (children.length > 0 && children[0].getText().equals(qualifierNode.getText())) {
return true;
}
}
return functionNode == null && qualifierNode == null;
}
}
@Override
public void indexStub(PyTargetExpressionStub stub, IndexSink sink) {
python/testData/stubs/VariableInComprehension.py
+1
View File
@@ -0,0 +1 @@
print [xyzzy for xyzzy in range(1, 10)]
python/testSrc/com/jetbrains/python/PyStubsTest.java
+9 -1
View File
@@ -316,9 +316,17 @@ public class PyStubsTest extends PyLightFixtureTestCase {
}
public void testIfNameMain() { // PY-4008
ensureVariableNotInIndex("xyzzy");
}
public void testVariableInComprehension() { // PY-4029
ensureVariableNotInIndex("xyzzy");
}
private void ensureVariableNotInIndex(String name) {
getTestFile();
GlobalSearchScope scope = GlobalSearchScope.allScope(myFixture.getProject());
Collection<PyTargetExpression> result = PyVariableNameIndex.find("xyzzy", myFixture.getProject(), scope);
Collection<PyTargetExpression> result = PyVariableNameIndex.find(name, myFixture.getProject(), scope);
assertEquals(0, result.size());
}