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

added searching if statement in children

Browse Source
This commit is contained in:
Ekaterina Tuzova
2010-11-24 16:45:18 +03:00
parent 72322c3c64
commit 078d4b5bb0
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/PyBundle.properties
+1
View File
@@ -123,6 +123,7 @@ INTN.flip.$0.to.$1=Flip ''{0}'' to ''{1}''
INTN.convert.string=Convert single-quoted string to double-quoted
INTN.join.if=Join if's
INTN.join.if.text=Join two if's
# Conflict checker
CONFLICT.name.$0.obscured=Name ''{0}'' obscured by local definitions
python/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java
+24 -6
View File
@@ -24,18 +24,36 @@ public class PyJoinIfIntention extends BaseIntentionAction {
@NotNull
public String getText() {
return PyBundle.message("INTN.join.if");
return PyBundle.message("INTN.join.if.text");
}
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
PyIfStatement expression =
PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()), PyIfStatement.class);
while (expression != null) {
PyStatement firstStatement = expression.getIfPart().getStatementList().getStatements()[0];
if (firstStatement instanceof PyIfStatement) {
return true;
PyStatementList stList = expression.getIfPart().getStatementList();
if (stList != null) {
if (stList.getStatements().length != 0) {
PyStatement firstStatement = stList.getStatements()[0];
if (firstStatement instanceof PyIfStatement) {
return true;
}
}
}
expression = PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()), PyIfStatement.class);
expression = PsiTreeUtil.getParentOfType(expression, PyIfStatement.class);
}
expression = PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()), PyIfStatement.class);
while (expression != null) {
PyStatementList stList = expression.getIfPart().getStatementList();
if (stList != null) {
if (stList.getStatements().length != 0) {
PyStatement firstStatement = stList.getStatements()[0];
if (firstStatement instanceof PyIfStatement) {
return true;
}
}
}
expression = PsiTreeUtil.getChildOfType(expression, PyIfStatement.class);
}
return false;
}
@@ -50,7 +68,7 @@ public class PyJoinIfIntention extends BaseIntentionAction {
if (firstStatement instanceof PyIfStatement) {
break;
}
expression = PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()), PyIfStatement.class);
expression = PsiTreeUtil.getParentOfType(expression, PyIfStatement.class);
}
if (firstStatement != null && firstStatement instanceof PyIfStatement) {
PyExpression condition = ((PyIfStatement)firstStatement).getIfPart().getCondition();
python/testSrc/com/jetbrains/python/PyIntentionTest.java
+1 -1
View File
@@ -110,6 +110,6 @@ public class PyIntentionTest extends PyLightFixtureTestCase {
}
public void testJoinIf() {
doTest(PyBundle.message("INTN.join.if"));
doTest(PyBundle.message("INTN.join.if.text"));
}
}