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 PY-11929 Insert type assertion should be disabled for references introduced in dict comprehensions

Browse Source
This commit is contained in:
Ekaterina Tuzova
2014-05-14 19:28:59 +04:00
parent 19d7bf99a4
commit 8bc81772e0
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/intentions/TypeAssertionIntention.java
+11 -14
View File
@@ -63,15 +63,13 @@ public class TypeAssertionIntention implements IntentionAction {
PyExpression problemElement = PsiTreeUtil.getParentOfType(elementAt, PyReferenceExpression.class);
if (problemElement == null) return false;
if (problemElement.getParent() instanceof PyWithItem) return false;
if (problemElement instanceof PyQualifiedExpression) {
final PyExpression qualifier = ((PyQualifiedExpression)problemElement).getQualifier();
if (qualifier != null && !qualifier.getText().equals(PyNames.CANONICAL_SELF)) {
problemElement = qualifier;
}
final PyExpression qualifier = ((PyQualifiedExpression)problemElement).getQualifier();
if (qualifier != null && !qualifier.getText().equals(PyNames.CANONICAL_SELF)) {
problemElement = qualifier;
}
final PsiReference reference = problemElement.getReference();
if (problemElement.getParent() instanceof PyCallExpression ||
PsiTreeUtil.getParentOfType(problemElement, PyListCompExpression.class) != null ||
PsiTreeUtil.getParentOfType(problemElement, PyComprehensionElement.class) != null ||
PsiTreeUtil.getParentOfType(problemElement, PyLambdaExpression.class) != null ||
PsiTreeUtil.getParentOfType(problemElement, PyGeneratorExpression.class) != null ||
(reference != null && reference.resolve() == null)) {
@@ -88,13 +86,11 @@ public class TypeAssertionIntention implements IntentionAction {
PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
String name = problemElement.getText();
if (problemElement instanceof PyQualifiedExpression) {
final PyExpression qualifier = ((PyQualifiedExpression)problemElement).getQualifier();
if (qualifier != null && !qualifier.getText().equals(PyNames.CANONICAL_SELF)) {
final String referencedName = ((PyQualifiedExpression)problemElement).getReferencedName();
if (referencedName == null || PyNames.GETITEM.equals(referencedName))
name = qualifier.getText();
}
final PyExpression qualifier = ((PyQualifiedExpression)problemElement).getQualifier();
if (qualifier != null && !qualifier.getText().equals(PyNames.CANONICAL_SELF)) {
final String referencedName = ((PyQualifiedExpression)problemElement).getReferencedName();
if (referencedName == null || PyNames.GETITEM.equals(referencedName))
name = qualifier.getText();
}
final String text = "assert isinstance(" + name + ", )";
@@ -115,7 +111,7 @@ public class TypeAssertionIntention implements IntentionAction {
if (statementList != null) {
PsiElement statementListParent = PsiTreeUtil.getParentOfType(statementList, PyStatement.class);
if (document.getLineNumber(statementList.getTextOffset()) ==
if (statementListParent != null && document.getLineNumber(statementList.getTextOffset()) ==
document.getLineNumber(statementListParent.getTextOffset())) {
final String substring =
TextRange.create(statementListParent.getTextRange().getStartOffset(), statementList.getTextOffset()).substring(document.getText());
@@ -125,6 +121,7 @@ public class TypeAssertionIntention implements IntentionAction {
statementListParent = statementListParent.replace(foo);
statementList = PsiTreeUtil.findChildOfType(statementListParent, PyStatementList.class);
assert statementList != null;
element = statementList.getStatements()[0];
}
else
python/testData/intentions/beforeTypeAssertionInDictComp.py
+1
View File
@@ -0,0 +1 @@
a = {k: v <caret>for k, v in zip('abc', range(3)) if k % 2}
python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java
+4
View File
@@ -353,6 +353,10 @@ public class PyIntentionTest extends PyTestCase {
doTestTypeAssertion();
}
public void testTypeAssertionInDictComp() { //PY-7971
doNegativeTest(PyBundle.message("INTN.insert.assertion"));
}
private void doTestTypeAssertion() {
doTest(PyBundle.message("INTN.insert.assertion"));
}