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-4697 "join 2 if's" inspection suggestion is invalid

Browse Source
This commit is contained in:
Ekaterina Tuzova
2011-11-12 22:46:13 +01:00
parent 120122cfc4
commit d08bdb75bb
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java
+13 -5
View File
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -65,17 +66,24 @@ public class PyJoinIfIntention extends BaseIntentionAction {
PyIfStatement ifStatement = getIfStatement(expression);
PyStatement firstStatement = getFirstStatement(ifStatement);
if (ifStatement == null) return;
if (firstStatement != null && firstStatement instanceof PyIfStatement) {
PyExpression condition = ((PyIfStatement)firstStatement).getIfPart().getCondition();
PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
PyExpression newCondition = elementGenerator.createExpressionFromText(
ifStatement.getIfPart().getCondition().getText() + " and " + condition.getText());
ifStatement.getIfPart().getCondition().replace(newCondition);
PyExpression ifCondition = ifStatement.getIfPart().getCondition();
if (ifCondition == null || condition == null) return;
StringBuilder replacementText = new StringBuilder(ifCondition.getText() + " and ");
if (condition instanceof PyBinaryExpression && ((PyBinaryExpression)condition).getOperator() == PyTokenTypes.OR_KEYWORD) {
replacementText.append("(").append(condition.getText()).append(")");
} else
replacementText.append(condition.getText());
PyExpression newCondition = elementGenerator.createExpressionFromText(replacementText.toString());
ifCondition.replace(newCondition);
PyStatementList stList = ((PyIfStatement)firstStatement).getIfPart().getStatementList();
PyStatementList ifStatementList = ifStatement.getIfPart().getStatementList();
if (ifStatementList == null || stList == null) return;
List<PsiComment> comments = PsiTreeUtil.getChildrenOfTypeAsList(ifStatement.getIfPart(), PsiComment.class);
comments.addAll(PsiTreeUtil.getChildrenOfTypeAsList(((PyIfStatement)firstStatement).getIfPart(), PsiComment.class));
comments.addAll(PsiTreeUtil.getChildrenOfTypeAsList(ifStatementList, PsiComment.class));
python/testData/intentions/afterJoinIfBinary.py
+2
View File
@@ -0,0 +1,2 @@
if value is not None and (not validate_uint(value) or value <= self.begin):
print value
python/testData/intentions/beforeJoinIfBinary.py
+3
View File
@@ -0,0 +1,3 @@
if value is not<caret> None:
if not validate_uint(value) or value <= self.begin:
print value
python/testSrc/com/jetbrains/python/PyIntentionTest.java
+4
View File
@@ -134,6 +134,10 @@ public class PyIntentionTest extends PyTestCase {
doNegativeTest(PyBundle.message("INTN.join.if.text"));
}
public void testJoinIfBinary() { //PY-4697
doTest(PyBundle.message("INTN.join.if.text"));
}
public void testJoinIfMultiStatements() { //PY-2970
doNegativeTest(PyBundle.message("INTN.join.if.text"));
}